summaryrefslogtreecommitdiff
path: root/test/e2e/login_logout_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-19 08:39:37 -0400
committerGitHub <noreply@github.com>2020-06-19 08:39:37 -0400
commit5ec29f8d4e79500915ec79824d9eb21630205f3f (patch)
tree204060f7ecf7edc689f52869fd474b15d1d8a8b9 /test/e2e/login_logout_test.go
parenta2661b1c25e280282d101f24ce478305622da11f (diff)
parent334d3b1ef3a1148147454c4d935ebaf4b741e498 (diff)
downloadpodman-5ec29f8d4e79500915ec79824d9eb21630205f3f.tar.gz
podman-5ec29f8d4e79500915ec79824d9eb21630205f3f.tar.bz2
podman-5ec29f8d4e79500915ec79824d9eb21630205f3f.zip
Merge pull request #6684 from vrothberg/fix-ci
CI: force registry:2.6
Diffstat (limited to 'test/e2e/login_logout_test.go')
-rw-r--r--test/e2e/login_logout_test.go6
1 files changed, 3 insertions, 3 deletions
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))