Skip to content

Commit bfc775d

Browse files
committed
tests: Remove slirp for podman6
Signed-off-by: Lokesh Mandvekar <lsm5@linux.com>
1 parent f2d95ae commit bfc775d

4 files changed

Lines changed: 2 additions & 24 deletions

File tree

contrib/cirrus/logcollector.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ case $1 in
3535
podman
3636
runc
3737
skopeo
38-
slirp4netns
3938
)
4039
case $OS_RELEASE_ID in
4140
fedora*)

tests/bud.bats

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7715,22 +7715,6 @@ _EOF
77157715
fi
77167716
}
77177717

7718-
@test "bud with --network slirp4netns" {
7719-
skip_if_no_runtime
7720-
skip_if_in_container
7721-
skip_if_chroot
7722-
7723-
_prefetch alpine
7724-
7725-
run_buildah bud $WITH_POLICY_JSON --network slirp4netns $BUDFILES/network
7726-
# default subnet is 10.0.2.100/24
7727-
assert "$output" =~ "10.0.2.100/24" "ip addr shows default subnet"
7728-
7729-
run_buildah bud $WITH_POLICY_JSON --network slirp4netns:cidr=192.168.255.0/24,mtu=2000 $BUDFILES/network
7730-
assert "$output" =~ "192.168.255.100/24" "ip addr shows custom subnet"
7731-
assert "$output" =~ "mtu 2000" "ip addr shows mtu 2000"
7732-
}
7733-
77347718
@test "bud with --network pasta" {
77357719
skip_if_no_runtime
77367720
skip_if_chroot

tests/run.bats

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -730,10 +730,6 @@ function configure_and_check_user() {
730730
expect_output --substring "(10.88.*|10.0.2.100)[[:blank:]]$cid"
731731
assert "$output" !~ "(10.88.*|10.0.2.100)[[:blank:]]host1 $cid" "Container IP should not contain host1"
732732

733-
# check slirp4netns sets correct hostname with another cidr
734-
run_buildah run --network slirp4netns:cidr=192.168.2.0/24 --hostname $hostname $cid cat /etc/hosts
735-
expect_output --substring "192.168.2.100[[:blank:]]$hostname $cid"
736-
737733
run_buildah run --network=container $cid cat /etc/hosts
738734
m=$(buildah mount $cid)
739735
run cat $m/etc/hosts
@@ -816,9 +812,9 @@ function configure_and_check_user() {
816812
# filter out 127... nameservers
817813
run grep -v "nameserver 127." <<< "$output"
818814
nameservers="$output"
819-
# in case of rootless add extra slirp4netns nameserver
815+
# in case of rootless add extra pasta nameserver
820816
if is_rootless; then
821-
nameservers="nameserver 10.0.2.3
817+
nameservers="nameserver 169.254.1.1
822818
$output"
823819
fi
824820
run_buildah from --quiet --pull=false $WITH_POLICY_JSON alpine

tests/tmt/system.fmf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require:
22
- buildah-tests
33
- git-daemon
4-
- slirp4netns
54

65
environment:
76
BUILDAH_BINARY: /usr/bin/buildah

0 commit comments

Comments
 (0)