opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12343 from vrothberg/fix-ci

Browse Source 
fix CI
This commit is contained in:
OpenShift Merge Robot
2021-11-18 16:49:53 +01:00
committed by GitHub
parent 69e1204e5e 6f6a6925b2
commit 9b964945d6
5 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/fedora-minimal/Dockerfile
View File

@ -1 +0,0 @@
FROM registry.fedoraproject.org/fedora-minimal:latest

4
contrib/fedora-minimal/README.md
View File

@ -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

2
test/e2e/config.go
View File

@ -2,7 +2,7 @@ package integration
var ( var (
redis = "quay.io/libpod/redis:alpine" 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" ALPINE = "quay.io/libpod/alpine:latest"
ALPINELISTTAG = "quay.io/libpod/alpine:3.10.2" ALPINELISTTAG = "quay.io/libpod/alpine:3.10.2"
ALPINELISTDIGEST = "quay.io/libpod/alpine@sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f" ALPINELISTDIGEST = "quay.io/libpod/alpine@sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f"

2
test/e2e/images_test.go
View File

@ -144,7 +144,7 @@ var _ = Describe("Podman images", func() {
result := podmanTest.Podman([]string{"images", "-q", "-f", "reference=quay.io*"}) result := podmanTest.Podman([]string{"images", "-q", "-f", "reference=quay.io*"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0)) 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 := podmanTest.Podman([]string{"images", "-f", "reference=a*pine"})
retalpine.WaitWithDefaultTimeout() retalpine.WaitWithDefaultTimeout()

2
test/e2e/run_test.go
View File

@ -1516,7 +1516,7 @@ USER mail`, BB)
}) })
It("podman run --privileged and --group-add", func() { 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 := podmanTest.Podman([]string{"run", "-t", "-i", "--group-add", groupName, "--privileged", fedoraMinimal, "groups"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))