Merge pull request #16525 from Luap99/CI-update-image

update CI images to include pasta

.cirrus.yml

@@ -33,7 +33,7 @@ env:
     UBUNTU_NAME: "ubuntu-2204"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c5069932136759296"
+    IMAGE_SUFFIX: "c6447802205601792"
     # EC2 images
     FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
     FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}"
@@ -44,8 +44,7 @@ env:
     # Container FQIN's
     FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}"
-    # FIXME, replace override with common suffix once everything is in sync
-    WINDOWS_AMI: "win-server-wsl-c6447802205601792"
+    WINDOWS_AMI: "win-server-wsl-${IMAGE_SUFFIX}"
     ####
     #### Control variables that determine what to run and how to run it.
     #### N/B: Required ALL of these are set for every single task.

Makefile

@@ -571,6 +571,10 @@ ginkgo:
 ginkgo-remote:
 	$(MAKE) ginkgo-run TAGS="$(REMOTETAGS) remote_testing" HACK=
 
+.PHONY: testbindings
+testbindings: .install.ginkgo
+	ACK_GINKGO_RC=true $(GINKGO) -v $(TESTFLAGS) -tags "$(TAGS) remote" $(GINKGOTIMEOUT) -progress -trace -noColor -debug -timeout 30m  -v -r ./pkg/bindings/test
+
 .PHONY: localintegration
 localintegration: test-binaries ginkgo
 
@@ -901,7 +905,7 @@ install.systemd:
 endif
 
 .PHONY: install.tools
-install.tools: .install.golangci-lint .install.swagger ## Install needed tools
+install.tools: .install.golangci-lint ## Install needed tools
 	$(MAKE) -C test/tools
 
 .PHONY: .install.goimports

contrib/cirrus/lib.sh

@@ -219,7 +219,8 @@ use_cni() {
     #
     # FIXME FIXME FIXME: if/when we bring back Ubuntu (or use Debian),
     #       someone will have to conditionalize these rpm/dnf commands
-    rpm -e --nodeps netavark aardvark-dns
+    # Do not fail when netavark and aardvark-dns are not installed.
+    rpm -e --nodeps netavark aardvark-dns || true
     msg "Installing default CNI configuration"
     dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins*
     cd $GOSRC || exit 1

contrib/cirrus/logcollector.sh

@@ -56,6 +56,7 @@ case $1 in
                     container-selinux
                     libseccomp
                     netavark
+                    passt
                 )
                 ;;
             ubuntu)

contrib/cirrus/runner.sh

@@ -101,11 +101,8 @@ function _run_bindings() {
         gitcommit_magic="/define.gitCommit=${GIT_COMMIT}"
     fi
 
-    # Subshell needed so logformatter will write output in cwd; if it runs in
-    # the subdir, .cirrus.yml will not find the html'ized log
-    (cd pkg/bindings/test && \
-         echo "$gitcommit_magic" && \
-         ginkgo -progress -trace -noColor -debug -timeout 30m -r -v) |& logformatter
+    (echo "$gitcommit_magic" && \
+        make testbindings) |& logformatter
 }
 
 function _run_docker-py() {

test/e2e/run_networking_test.go

@@ -44,8 +44,6 @@ var _ = Describe("Podman run networking", func() {
 	})
 
 	It("podman verify network scoped DNS server and also verify updating network dns server", func() {
-		// TODO: Unskip after https://github.com/containers/podman/pull/16525
-		Skip("TODO: unskip after https://github.com/containers/podman/pull/16525")
 		// Following test is only functional with netavark and aardvark
 		SkipIfCNI(podmanTest)
 		net := createNetworkName("IntTest")
@@ -90,7 +88,6 @@ var _ = Describe("Podman run networking", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(1))
 		Expect(session.OutputToString()).To(ContainSubstring(";; connection timed out; no servers could be reached"))
-
 	})
 
 	It("podman run network connection with default bridge", func() {

test/system/505-networking-pasta.bats

@@ -335,6 +335,7 @@ function teardown() {
 }
 
 @test "podman networking with pasta(1) - Local forwarder, IPv4" {
+    skip "FIXME: #17074: some pasta dns problem"
     skip_if_no_ipv4 "IPv4 not routable on the host"
 
     run_podman run --dns 198.51.100.1 \