Skip to content

Commit ed14cd4

Browse files
committed
Revert "playbooks, test/system: Work around bug in pasta(1) networks"
The bug in pasta(1) that necessitated this workaround has since been fixed in passt 2024_05_10.7288448 [1]. Some host operating systems like CentOS Stream 10 no longer have slirp4netns(1), and it's generally better to test the defaults. This reverts commit b58f9a5. [1] containers/podman#22575 https://archives.passt.top/passt-dev/[email protected]/ https://archives.passt.top/passt-user/20240510225714.6aa8e6c0@elisabeth/ #1562
1 parent b524f4c commit ed14cd4

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

playbooks/dependencies-centos-9-stream.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- podman
1414
- shadow-utils-subid-devel
1515
- skopeo
16-
- slirp4netns
1716
- systemd
1817
- udisks2
1918

@@ -55,7 +54,7 @@
5554
chdir: '{{ zuul.project.src_dir }}'
5655

5756
- name: Check versions of crucial packages
58-
command: rpm -qa ShellCheck bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo slirp4netns
57+
command: rpm -qa ShellCheck bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
5958

6059
- name: Show podman versions
6160
command: podman version

playbooks/dependencies-fedora.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
- podman
3636
- shadow-utils-subid-devel
3737
- skopeo
38-
- slirp4netns
3938
- systemd
4039
- udisks2
4140
use: "{{ 'dnf' if zuul.attempts > 1 else 'auto' }}"
@@ -56,7 +55,7 @@
5655
chdir: '{{ zuul.project.src_dir }}'
5756

5857
- name: Check versions of crucial packages
59-
command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo slirp4netns
58+
command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
6059

6160
- name: Show podman versions
6261
command: podman version

test/system/libs/helpers.bash

-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ function _setup_docker_registry() {
195195
--env REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \
196196
--env REGISTRY_HTTP_TLS_KEY=/certs/domain.key \
197197
--name "${DOCKER_REG_NAME}" \
198-
--network slirp4netns \
199198
--privileged \
200199
--publish 50000:5000 \
201200
--rm \

0 commit comments

Comments
 (0)