diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-19 08:39:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 08:39:37 -0400 |
| commit | 5ec29f8d4e79500915ec79824d9eb21630205f3f (patch) | |
| tree | 204060f7ecf7edc689f52869fd474b15d1d8a8b9 /test/system | |
| parent | a2661b1c25e280282d101f24ce478305622da11f (diff) | |
| parent | 334d3b1ef3a1148147454c4d935ebaf4b741e498 (diff) | |
| download | podman-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/system')
| -rw-r--r-- | test/system/150-login.bats | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/system/150-login.bats b/test/system/150-login.bats index 89ae30a18..00c60ca95 100644 --- a/test/system/150-login.bats +++ b/test/system/150-login.bats @@ -61,9 +61,9 @@ function setup() { mkdir -p ${PODMAN_LOGIN_WORKDIR}/runroot PODMAN_LOGIN_ARGS="--root ${PODMAN_LOGIN_WORKDIR}/root --runroot ${PODMAN_LOGIN_WORKDIR}/runroot" # Give it three tries, to compensate for flakes - run_podman ${PODMAN_LOGIN_ARGS} pull registry:2 || - run_podman ${PODMAN_LOGIN_ARGS} pull registry:2 || - run_podman ${PODMAN_LOGIN_ARGS} pull registry:2 + run_podman ${PODMAN_LOGIN_ARGS} pull registry:2.6 || + run_podman ${PODMAN_LOGIN_ARGS} pull registry:2.6 || + run_podman ${PODMAN_LOGIN_ARGS} pull registry:2.6 # Registry image needs a cert. Self-signed is good enough. CERT=$AUTHDIR/domain.crt @@ -77,7 +77,7 @@ function setup() { # Store credentials where container will see them if [ ! -e $AUTHDIR/htpasswd ]; then run_podman ${PODMAN_LOGIN_ARGS} run --rm \ - --entrypoint htpasswd registry:2 \ + --entrypoint htpasswd registry:2.6 \ -Bbn ${PODMAN_LOGIN_USER} ${PODMAN_LOGIN_PASS} \ > $AUTHDIR/htpasswd @@ -97,7 +97,7 @@ function setup() { -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \ -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \ -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \ - registry:2 + registry:2.6 } # END first "test" - start a registry for use by other tests |