diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2020-06-19 12:54:02 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-06-19 12:58:02 +0200 |
| commit | 334d3b1ef3a1148147454c4d935ebaf4b741e498 (patch) | |
| tree | 204060f7ecf7edc689f52869fd474b15d1d8a8b9 /test/e2e | |
| parent | a2661b1c25e280282d101f24ce478305622da11f (diff) | |
| download | podman-334d3b1ef3a1148147454c4d935ebaf4b741e498.tar.gz podman-334d3b1ef3a1148147454c4d935ebaf4b741e498.tar.bz2 podman-334d3b1ef3a1148147454c4d935ebaf4b741e498.zip | |
CI: force registry:2.6
For using the `registry:2.6` image. 2.7 and beyond dropped the
`htpasswd` binary from the rootfs which parts of our CI depends
on.
While this is not a sustainable solution (assuming `htpasswd` is gone
for ever), it unblocks the CI for now.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/config_amd64.go | 2 | ||||
| -rw-r--r-- | test/e2e/login_logout_test.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go index 01aa8445a..7e5765ac7 100644 --- a/test/e2e/config_amd64.go +++ b/test/e2e/config_amd64.go @@ -8,6 +8,6 @@ var ( CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck} nginx = "quay.io/libpod/alpine_nginx:latest" BB_GLIBC = "docker.io/library/busybox:glibc" - registry = "docker.io/library/registry:2" + registry = "docker.io/library/registry:2.6" labels = "quay.io/libpod/alpine_labels:latest" ) diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index 3f76daa67..66289dfc3 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -55,7 +55,7 @@ var _ = Describe("Podman login and logout", func() { } } - session := podmanTest.Podman([]string{"run", "--entrypoint", "htpasswd", "registry:2", "-Bbn", "podmantest", "test"}) + session := podmanTest.Podman([]string{"run", "--entrypoint", "htpasswd", "registry:2.6", "-Bbn", "podmantest", "test"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -84,7 +84,7 @@ var _ = Describe("Podman login and logout", func() { strings.Join([]string{authPath, "/auth"}, ":"), "-e", "REGISTRY_AUTH=htpasswd", "-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", "-e", "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "-v", strings.Join([]string{certPath, "/certs"}, ":"), "-e", "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", - "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2"}) + "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2.6"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -228,7 +228,7 @@ var _ = Describe("Podman login and logout", func() { strings.Join([]string{authPath, "/auth"}, ":"), "-e", "REGISTRY_AUTH=htpasswd", "-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", "-e", "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "-v", strings.Join([]string{certPath, "/certs"}, ":"), "-e", "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", - "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2"}) + "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2.6"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |