diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-06-09 12:17:17 -0600 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2022-06-14 16:12:10 -0400 |
| commit | d5fb5679c62d9c602a2878b1eb880c8e78969649 (patch) | |
| tree | 1f690d73be4898bc9c78cd515dbc9f587548ccab | |
| parent | 3eee4585ef9068212fc4b34aa611d082601dc97c (diff) | |
| download | podman-d5fb5679c62d9c602a2878b1eb880c8e78969649.tar.gz podman-d5fb5679c62d9c602a2878b1eb880c8e78969649.tar.bz2 podman-d5fb5679c62d9c602a2878b1eb880c8e78969649.zip | |
APIv2 tests: (try to) fix flaky registry panic
APIv2 tests are flaky after this morning's merge of #14543.
Symptom:
test-apiv2: Timed out (10s) waiting for service (/dev/tcp/localhost/5564)
journal shows:
registry[7421]: panic: unable to configure authorization (htpasswd):
no access controller registered with name: none
Possible cause:
Mix of REGISTRY_AUTH=none with REGISTRY_AUTH_HTPASSWD_* vars.
https://github.com/distribution/distribution/issues/1168
Solution:
only set _HTPASSWD_* vars when AUTH=htpasswd
Signed-off-by: Ed Santiago <santiago@redhat.com>
| -rwxr-xr-x | test/apiv2/test-apiv2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2 index 6151b7672..8ecc2aa2d 100755 --- a/test/apiv2/test-apiv2 +++ b/test/apiv2/test-apiv2 @@ -443,12 +443,18 @@ function start_registry() { # If invoked with auth=htpasswd, create credentials REGISTRY_USERNAME= REGISTRY_PASSWORD= + declare -a registry_auth_params=(-e "REGISTRY_AUTH=$auth") if [[ "$auth" = "htpasswd" ]]; then REGISTRY_USERNAME=u$(random_string 7) REGISTRY_PASSWORD=p$(random_string 7) htpasswd -Bbn ${REGISTRY_USERNAME} ${REGISTRY_PASSWORD} \ > $AUTHDIR/htpasswd + + registry_auth_params+=( + -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" + -e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd" + ) fi # Run the registry, and wait for it to come up @@ -456,9 +462,7 @@ function start_registry() { -p ${REGISTRY_PORT}:5000 \ --name registry \ -v $AUTHDIR:/auth:Z \ - -e "REGISTRY_AUTH=$auth" \ - -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \ - -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \ + "${registry_auth_params[@]}" \ -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \ -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \ ${REGISTRY_IMAGE} |