Merge pull request #5191 from baude/fedoraminimaliskillingme

use quay.io/libpod/fedora-minimal for reliability

4 files changed, 3 insertions, 5 deletions

diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go
index 3ff6210d9..19f7eee1e 100644
--- a/libpod/image/image_test.go
+++ b/libpod/image/image_test.go
@@ -18,7 +18,6 @@ import (
 var (
 	bbNames      = []string{"docker.io/library/busybox:latest", "docker.io/library/busybox", "docker.io/busybox:latest", "docker.io/busybox", "busybox:latest", "busybox"}
 	bbGlibcNames = []string{"docker.io/library/busybox:glibc", "docker.io/busybox:glibc", "busybox:glibc"}
-	fedoraNames  = []string{"registry.fedoraproject.org/fedora-minimal:latest", "registry.fedoraproject.org/fedora-minimal", "fedora-minimal:latest", "fedora-minimal"}
 )
 
 type localImageTest struct {
@@ -139,7 +138,6 @@ func TestImage_New(t *testing.T) {
 	ir.Eventer = events.NewNullEventer()
 	// Build the list of pull names
 	names = append(names, bbNames...)
-	names = append(names, fedoraNames...)
 	writer := os.Stdout
 
 	// Iterate over the names and delete the image
diff --git a/test/e2e/config.go b/test/e2e/config.go
index 96cc157be..95b0481b3 100644
--- a/test/e2e/config.go
+++ b/test/e2e/config.go
@@ -2,7 +2,7 @@ package integration
 
 var (
 	redis             = "docker.io/library/redis:alpine"
-	fedoraMinimal     = "registry.fedoraproject.org/fedora-minimal:latest"
+	fedoraMinimal     = "quay.io/libpod/fedora-minimal:latest"
 	ALPINE            = "docker.io/library/alpine:latest"
 	ALPINELISTTAG     = "docker.io/library/alpine:3.10.2"
 	ALPINELISTDIGEST  = "docker.io/library/alpine@sha256:72c42ed48c3a2db31b7dafe17d275b634664a708d901ec9fd57b1529280f01fb"
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index 9ff358d26..9a2cee9e1 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -205,7 +205,7 @@ var _ = Describe("Podman load", func() {
 		podmanTest.RestoreArtifact(fedoraMinimal)
 		outfile := filepath.Join(podmanTest.TempDir, "load_test.tar.gz")
 
-		setup := podmanTest.PodmanNoCache([]string{"tag", "fedora-minimal", "hello"})
+		setup := podmanTest.PodmanNoCache([]string{"tag", fedoraMinimal, "hello"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
 
diff --git a/test/endpoint/endpoint.go b/test/endpoint/endpoint.go
index 78aa957ab..f1634b6f0 100644
--- a/test/endpoint/endpoint.go
+++ b/test/endpoint/endpoint.go
@@ -29,7 +29,7 @@ var (
 	infra            = "k8s.gcr.io/pause:3.1"
 	BB               = "docker.io/library/busybox:latest"
 	redis            = "docker.io/library/redis:alpine"
-	fedoraMinimal    = "registry.fedoraproject.org/fedora-minimal:latest"
+	fedoraMinimal    = "quay.io/libpod/fedora-minimal:latest"
 )
 
 type EndpointTestIntegration struct {