Print mirror info for debugging

LLNL · Jun 26, 2024 · 904f971 · 904f971
1 parent 5484cc7
commit 904f971
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,6 +29,8 @@ stages:
   - clean
 
 include:
+  - project: 'lc-templates/id_tokens'
+    file: 'id_tokens.yml'
   - local: .gitlab/core-ci.yml
     rules:
       - if: $MY_ENV_NAME != null

diff --git a/.gitlab/core-ci.yml b/.gitlab/core-ci.yml
@@ -27,7 +27,9 @@ get-spack:
   script:
     - . ${MY_SPACK_PATH}/share/spack/setup-env.sh
     - spack ${MY_SPACK_DEBUG} env activate --without-view spack-environments/${MY_ENV_NAME}
-    - spack mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination "oci://${CI_REGISTRY_IMAGE}"
+    - spack config blame mirrors
+    - spack mirror -v -d add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination "oci://${CI_REGISTRY_IMAGE}"
+    - spack config blame mirrors
 #    - spack ${MY_SPACK_DEBUG} concretize || spack ${MY_SPACK_DEBUG} concretize
     - spack ${MY_SPACK_DEBUG} --color=always
         --config-scope "${CI_PROJECT_DIR}/.gitlab/spack"

diff --git a/.gitlab/spack/ci.yaml b/.gitlab/spack/ci.yaml
@@ -24,15 +24,19 @@ ci:
         tags: [ruby, shell]
         script:
         - spack ${MY_SPACK_DEBUG} env activate --without-view ${SPACK_CONCRETE_ENV_DIR}
+        - spack config blame mirrors
         - spack mirror set --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination
+        - spack config blame mirrors
         - spack ${MY_SPACK_DEBUG} ci rebuild
     - match:
       - 'target=ppc64le:'
       build-job:
         tags: [lassen, shell]
         script:
         - spack ${MY_SPACK_DEBUG} env activate --without-view ${SPACK_CONCRETE_ENV_DIR}
+        - spack config blame mirrors
         - spack mirror set --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination
+        - spack config blame mirrors
         - spack ${MY_SPACK_DEBUG} ci rebuild
     match_behavior: first
 
@@ -43,7 +47,9 @@ ci:
         - export SPACK_DISABLE_LOCAL_CONFIG=""
         - export SPACK_USER_CACHE_PATH="${MY_SPACK_USER_CACHE}"
         - spack --version
+        - spack config blame mirrors
         - spack mirror add --oci-username ${CI_REGISTRY_USER} --oci-password ${CI_REGISTRY_PASSWORD} buildcache-destination oci://${CI_REGISTRY_IMAGE}
+        - spack config blame mirrors
   - noop-job:
       tags: [oslic, shell]
   - cleanup-job:

diff --git a/scripts/get-spack b/scripts/get-spack
@@ -33,7 +33,7 @@ else
   git branch -D ${MY_SPACK_BRANCH} || true
   git fetch --depth 1 ${MY_SPACK_REPO} ${MY_SPACK_BRANCH}:${MY_SPACK_BRANCH}
   git checkout ${MY_SPACK_BRANCH}
-  git tag ${MY_PIPELINE_ID}
+  git tag ${CI_PIPELINE_ID}
   git branch -D temp
   cd -
 fi