test: add auth to inspect private container image registry

Signed-off-by: Xiaofeng Wang <[email protected]>
virt-s1 · Apr 19, 2024 · e084724 · e084724
1 parent 36a7c40
commit e084724
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/anaconda.sh b/anaconda.sh
@@ -3,6 +3,7 @@ set -exuo pipefail
 
 source tools/shared_lib.sh
 dump_runner
+image_inspect
 
 greenprint "Start firewalld"
 sudo systemctl enable --now firewalld

diff --git a/bib-image.sh b/bib-image.sh
@@ -3,6 +3,7 @@ set -exuo pipefail
 
 source tools/shared_lib.sh
 dump_runner
+image_inspect
 
 TEMPDIR=$(mktemp -d)
 trap 'rm -rf -- "$TEMPDIR"' EXIT

diff --git a/os-replace.sh b/os-replace.sh
@@ -3,6 +3,7 @@ set -exuo pipefail
 
 source tools/shared_lib.sh
 dump_runner
+image_inspect
 
 TEMPDIR=$(mktemp -d)
 trap 'rm -rf -- "$TEMPDIR"' EXIT

diff --git a/tools/shared_lib.sh b/tools/shared_lib.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-# shellcheck disable=SC2034
-REDHAT_ID=$(skopeo inspect --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.id"')
-REDHAT_VERSION_ID=$(skopeo inspect --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.version-id"')
-CURRENT_COMPOSE_ID=$(skopeo inspect --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
-
 # Dumps details about the instance running the CI job.
 function dump_runner {
     RUNNER_CPUS=$(nproc)
@@ -51,3 +46,15 @@ function retry {
     done
 }
 
+function image_inspect {
+    # shellcheck disable=SC2034
+    if [[ $TIER1_IMAGE_URL == quay* ]]; then
+        REDHAT_ID=$(skopeo inspect --tls-verify=false --creds "$QUAY_USERNAME":"$QUAY_PASSWORD" docker://"${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.id"')
+        REDHAT_VERSION_ID=$(skopeo inspect --tls-verify=false --creds "$QUAY_USERNAME":"$QUAY_PASSWORD" "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.version-id"')
+        CURRENT_COMPOSE_ID=$(skopeo inspect --tls-verify=false --creds "$QUAY_USERNAME":"$QUAY_PASSWORD" "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
+    else
+        REDHAT_ID=$(skopeo inspect --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.id"')
+        REDHAT_VERSION_ID=$(skopeo inspect --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.version-id"')
+        CURRENT_COMPOSE_ID=$(skopeo inspect --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
+    fi
+}