From 85cc4092fc8b73b5e3f962c2305e00acd02cb734 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 23 Oct 2023 06:19:19 -0600 Subject: [PATCH] CI: stop using registry.k8s.io It's flaky. Signed-off-by: Ed Santiago --- test/e2e/config.go | 2 +- test/e2e/images_test.go | 2 +- test/e2e/play_kube_test.go | 2 +- test/system/200-pod.bats | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/config.go b/test/e2e/config.go index 5f18801dcf..b70901326f 100644 --- a/test/e2e/config.go +++ b/test/e2e/config.go @@ -10,7 +10,7 @@ var ( ALPINEAMD64ID = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4" ALPINEARM64DIGEST = "quay.io/libpod/alpine@sha256:f270dcd11e64b85919c3bab66886e59d677cf657528ac0e4805d3c71e458e525" ALPINEARM64ID = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672" - INFRA_IMAGE = "registry.k8s.io/pause:3.2" //nolint:revive,stylecheck + INFRA_IMAGE = "quay.io/libpod/k8s-pause:3.5" //nolint:revive,stylecheck BB = "quay.io/libpod/busybox:latest" HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest" //nolint:revive,stylecheck fedoraToolbox = "registry.fedoraproject.org/fedora-toolbox:36" diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 563715c8d1..9813062645 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -148,7 +148,7 @@ var _ = Describe("Podman images", func() { result := podmanTest.Podman([]string{"images", "-q", "-f", "reference=quay.io/libpod/*"}) result.WaitWithDefaultTimeout() Expect(result).Should(ExitCleanly()) - Expect(result.OutputToStringArray()).To(HaveLen(9)) + Expect(result.OutputToStringArray()).To(HaveLen(10)) retalpine := podmanTest.Podman([]string{"images", "-f", "reference=*lpine*"}) retalpine.WaitWithDefaultTimeout() diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index b1ba5431d3..c936890c2f 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -2190,7 +2190,7 @@ var _ = Describe("Podman kube play", func() { It("should use customized infra_image", func() { conffile := filepath.Join(podmanTest.TempDir, "container.conf") - infraImage := "registry.k8s.io/pause:3.2" + infraImage := INFRA_IMAGE err := os.WriteFile(conffile, []byte(fmt.Sprintf("[engine]\ninfra_image=\"%s\"\n", infraImage)), 0644) Expect(err).ToNot(HaveOccurred()) diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats index e22e2e8528..1a47aa4f82 100644 --- a/test/system/200-pod.bats +++ b/test/system/200-pod.bats @@ -353,7 +353,7 @@ EOF @test "podman pod create should fail when infra-name is already in use" { local infra_name="infra_container_$(random_string 10 | tr A-Z a-z)" - local infra_image="registry.k8s.io/pause:3.5" + local infra_image="quay.io/libpod/k8s-pause:3.5" local pod_name="$(random_string 10 | tr A-Z a-z)" run_podman --noout pod create --name $pod_name --infra-name "$infra_name" --infra-image "$infra_image"