Merge pull request #28804 from Luap99/test-fixes

More test fixes for new CI

Author: baude

test/e2e/container_iface_name_test.go

@@ -101,7 +101,7 @@ var _ = Describe("Podman container interface name", func() {
 
 				// There is no nic created by the macvlan/ipvlan driver.
 				defer podmanTest.removeNetwork(netName1)
-				nc1 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "--subnet", "10.10.0.0/24", netName1})
+				nc1 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "--subnet", "10.9.0.0/24", netName1})
 				nc1.WaitWithDefaultTimeout()
 				Expect(nc1).Should(ExitCleanly())
 
@@ -115,7 +115,7 @@ var _ = Describe("Podman container interface name", func() {
 				Expect(exec1.OutputToString()).Should(ContainSubstring("eth0"))
 
 				defer podmanTest.removeNetwork(netName2)
-				nc2 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "--subnet", "10.25.40.0/24", netName2})
+				nc2 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "--subnet", "10.25.41.0/24", netName2})
 				nc2.WaitWithDefaultTimeout()
 				Expect(nc2).Should(ExitCleanly())
 
@@ -158,7 +158,7 @@ var _ = Describe("Podman container interface name", func() {
 			createNetworkDevice(nicName1)
 
 			defer podmanTest.removeNetwork(netName1)
-			nc1 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent1, "--subnet", "10.10.0.0/24", netName1})
+			nc1 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent1, "--subnet", "10.9.1.0/24", netName1})
 			nc1.WaitWithDefaultTimeout()
 			Expect(nc1).Should(ExitCleanly())
 
@@ -175,7 +175,7 @@ var _ = Describe("Podman container interface name", func() {
 			createNetworkDevice(nicName2)
 
 			defer podmanTest.removeNetwork(netName2)
-			nc2 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent2, "--subnet", "10.25.40.0/24", netName2})
+			nc2 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent2, "--subnet", "10.25.42.0/24", netName2})
 			nc2.WaitWithDefaultTimeout()
 			Expect(nc2).Should(ExitCleanly())
 
@@ -219,7 +219,7 @@ var _ = Describe("Podman container interface name", func() {
 			createNetworkDevice(nicName1)
 
 			defer podmanTest.removeNetwork(netName1)
-			nc1 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent1, "--subnet", "10.10.0.0/24", netName1})
+			nc1 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent1, "--subnet", "10.9.2.0/24", netName1})
 			nc1.WaitWithDefaultTimeout()
 			Expect(nc1).Should(ExitCleanly())
 
@@ -236,7 +236,7 @@ var _ = Describe("Podman container interface name", func() {
 			createNetworkDevice(nicName2)
 
 			defer podmanTest.removeNetwork(netName2)
-			nc2 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent2, "--subnet", "10.25.40.0/24", netName2})
+			nc2 := podmanTest.Podman([]string{"network", "create", "-d", driverType, "-o", parent2, "--subnet", "10.25.43.0/24", netName2})
 			nc2.WaitWithDefaultTimeout()
 			Expect(nc2).Should(ExitCleanly())
 

test/e2e/run_networking_test.go

@@ -935,9 +935,9 @@ EXPOSE 2004-2005/tcp`, ALPINE)
 
 	It("podman run with new:pod and static-ip", func() {
 		netName := stringid.GenerateRandomID()
-		ipAddr := "10.25.40.128"
+		ipAddr := "10.25.44.128"
 		podname := "testpod"
-		create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.40.0/24", netName})
+		create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.44.0/24", netName})
 		create.WaitWithDefaultTimeout()
 		Expect(create).Should(ExitCleanly())
 		defer podmanTest.removeNetwork(netName)

test/system/050-stop.bats

@@ -187,7 +187,7 @@ load helpers
 
     # Wait for container to acknowledge the signal. We can't use wait_for_output
     # because that aborts if .State.Running != true
-    local timeout=5
+    local timeout=10
     while [[ $timeout -gt 0 ]]; do
         run_podman logs $ctrname
         if [[ "$output" =~ "Received SIGTERM, ignoring" ]]; then
@@ -206,7 +206,7 @@ load helpers
     # Time check: make sure we were able to run 'ps' before the container
     # exited. If this takes too long, it means ps had to wait for lock.
     local delta_t=$(( $SECONDS - t0 ))
-    assert $delta_t -le 5 "Operations took too long"
+    assert $delta_t -le 7 "Operations took too long"
 
     run_podman kill $ctrname
     run_podman wait $ctrname

test/system/130-kill.bats

@@ -124,7 +124,7 @@ load helpers
     # 14761 - concurrent kill/stop must record the exit code
     cname=c-$(safename)
     run_podman run -d --replace --name=$cname $IMAGE sh -c "trap 'echo Received SIGTERM, ignoring' SIGTERM; echo READY; while :; do sleep 0.2; done"
-    "${PODMAN_CMD[@]}" stop -t 1 $cname &
+    "${PODMAN_CMD[@]}" stop -t 5 $cname &
     run_podman kill $cname
     run_podman wait $cname
     run_podman rm -f $cname

test/system/220-healthcheck.bats

@@ -429,6 +429,8 @@ function _check_health_log {
     msg="hc-msg-$(random_string)"
     hcStatus=$PODMAN_TMPDIR/hcStatus
 
+    # Disable systemd healthcheck in the background as they mess up the timings of the manual commands.
+    export DISABLE_HC_SYSTEMD="true"
     run_podman run -d --name $ctr             \
            --health-cmd "touch /tmp/abc; sleep 20; echo $msg" \
            $IMAGE /home/podman/pause

test/system/250-systemd.bats

@@ -55,6 +55,7 @@ function mv-safely() {
 
 # Helper to start a systemd service running a container
 function service_setup() {
+    local extra_args="$1"
     # January 2024: we can no longer do "run_podman generate systemd" followed
     # by "echo $output >file", because generate-systemd is deprecated and now
     # says so loudly, to stderr, with no way to silence it. Since BATS gloms
@@ -65,6 +66,7 @@ function service_setup() {
         run_podman generate systemd --files --name \
                -e http_proxy -e https_proxy -e no_proxy \
                -e HTTP_PROXY -e HTTPS_PROXY -e NO_PROXY \
+               $extra_args \
                --new $cname
         mv-safely "container-$cname.service" $UNIT_FILE
     )
@@ -359,7 +361,7 @@ LISTEN_FDNAMES=listen_fdnames" | sort)
                $IMAGE /home/podman/pause
 
     # run container in systemd unit
-    service_setup
+    service_setup "-e DISABLE_HC_SYSTEMD=true"
 
     run_podman container inspect $cname --format "{{.ID}}"
     oldID="$output"