diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-11-18 14:12:10 +0100 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-11-22 09:30:01 -0700 |
| commit | fe30b30458098c2d4f97e3cf5513870a6bac8e06 (patch) | |
| tree | 3f1a1b54bbce0126b534f1bc2c369e54f96253ff | |
| parent | 2d265da0ec6d88c0644d96c8077fe15b3ac64ea0 (diff) | |
| download | podman-fe30b30458098c2d4f97e3cf5513870a6bac8e06.tar.gz podman-fe30b30458098c2d4f97e3cf5513870a6bac8e06.tar.bz2 podman-fe30b30458098c2d4f97e3cf5513870a6bac8e06.zip | |
fix CI
[Backport #12343, which fixes the change in fedora-minimal image]
Our fedora-minimal image on Quay bases on fedora-minimal:latest which
starting with F35 removed a number of binaries that our CI depends on.
Fix that by pulling `fedora-minimal:34` from the Fedora registry
directly.
Once the build bot on Quay has been disabled, we move the image over
there to make sure that it will not change over time.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| -rw-r--r-- | contrib/fedora-minimal/Dockerfile | 1 | ||||
| -rw-r--r-- | contrib/fedora-minimal/README.md | 4 | ||||
| -rw-r--r-- | test/e2e/config.go | 2 | ||||
| -rw-r--r-- | test/e2e/images_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/contrib/fedora-minimal/Dockerfile b/contrib/fedora-minimal/Dockerfile deleted file mode 100644 index a051b3204..000000000 --- a/contrib/fedora-minimal/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM registry.fedoraproject.org/fedora-minimal:latest diff --git a/contrib/fedora-minimal/README.md b/contrib/fedora-minimal/README.md deleted file mode 100644 index 52bf94b53..000000000 --- a/contrib/fedora-minimal/README.md +++ /dev/null @@ -1,4 +0,0 @@ -This dockerfile exists so that the container image can be "mirrored" -onto quay.io automatically, so automated testing can be more resilient. - -https://quay.io/repository/libpod/fedora-minimal?tab=builds diff --git a/test/e2e/config.go b/test/e2e/config.go index 2552595ad..9c810575b 100644 --- a/test/e2e/config.go +++ b/test/e2e/config.go @@ -2,7 +2,7 @@ package integration var ( redis = "quay.io/libpod/redis:alpine" - fedoraMinimal = "quay.io/libpod/fedora-minimal:latest" + fedoraMinimal = "registry.fedoraproject.org/fedora-minimal:34" ALPINE = "quay.io/libpod/alpine:latest" ALPINELISTTAG = "quay.io/libpod/alpine:3.10.2" ALPINELISTDIGEST = "quay.io/libpod/alpine@sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f" diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index b4ec7447e..3a9f3f513 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -144,7 +144,7 @@ var _ = Describe("Podman images", func() { result := podmanTest.Podman([]string{"images", "-q", "-f", "reference=quay.io*"}) result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) - Expect(len(result.OutputToStringArray())).To(Equal(8)) + Expect(len(result.OutputToStringArray())).To(Equal(7)) retalpine := podmanTest.Podman([]string{"images", "-f", "reference=a*pine"}) retalpine.WaitWithDefaultTimeout() diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index ca39989cd..8f640eacf 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1457,7 +1457,7 @@ USER mail`, BB) }) It("podman run --privileged and --group-add", func() { - groupName := "kvm" + groupName := "mail" session := podmanTest.Podman([]string{"run", "-t", "-i", "--group-add", groupName, "--privileged", fedoraMinimal, "groups"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) |