use new id_tokens for gitlab

.gitlab-ci.yml

@@ -1,3 +1,7 @@
+include:
+  - component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main
+  - local: .gitlab/subscribed-pipelines.yml
+
 variables:
   CUSTOM_CI_BUILDS_DIR: "/usr/workspace/variorum/gitlab-runner"
   BUILD_ROOT: ${CI_PROJECT_DIR}
@@ -15,6 +19,3 @@ stages:
     strategy: depend
     forward:
       pipeline_variables: true
-
-include:
-  - local: .gitlab/subscribed-pipelines.yml

.gitlab/corona-gpu-build-and-test.yml

@@ -1,3 +1,5 @@
+include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main]
+
 stages:
   - status_initiate
   - build
@@ -25,6 +27,9 @@ stages:
 status_pending:
   extends: [.on_corona]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report

.gitlab/cztb2-build-and-test.yml → .gitlab/cztb3-build-and-test.yml

@@ -1,12 +1,14 @@
+include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main]
+
 stages:
   - status_initiate
   - build
   - status_update
 
-.on_cztb2:
+.on_cztb3:
   tags:
     - shell
-    - cztb2
+    - cztb3
   rules:
     # Only report failure if the pipeline failed.
     - if: '$CI_JOB_NAME =~ /status_failure/'
@@ -15,7 +17,7 @@ stages:
     - when: on_success
 
 .status_report: &status_report
-    - export context="cztb2"
+    - export context="cztb3"
     - |
       curl --url "https://api.github.com/repos/llnl/${CI_PROJECT_NAME}/statuses/${CI_COMMIT_SHA}" \
            --header 'Content-Type: application/json' \
@@ -25,18 +27,21 @@ stages:
 status_pending:
   tags:
     - shell
-    - cztb2
-  extends: [.on_cztb2]
+    - cztb3
+  extends: [.on_cztb3]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report
 
 status_success:
   tags:
     - shell
-    - cztb2
-  extends: [.on_cztb2]
+    - cztb3
+  extends: [.on_cztb3]
   stage: status_update
   script:
     - export pipeline_status="success"
@@ -46,19 +51,19 @@ status_success:
 status_failure:
   tags:
     - shell
-    - cztb2
-  extends: [.on_cztb2]
+    - cztb3
+  extends: [.on_cztb3]
   stage: status_update
   script:
     - export pipeline_status="failure"
     - *status_report
   when: on_failure
 
 # build across power lab
-build-cztb2:
+build-cztb3:
  tags:
    - shell
-   - cztb2
+   - cztb3
  stage: build
  script:
    - git clone $VARIORUM_ANSIBLE

.gitlab/quartz-build-and-test.yml → .gitlab/dane-build-and-test.yml

@@ -1,12 +1,14 @@
+include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main]
+
 stages:
   - status_initiate
   - build
   - status_update
 
-.on_quartz:
+.on_dane:
   tags:
     - shell
-    - quartz
+    - dane
   rules:
     # Only report failure if the pipeline failed.
     - if: '$CI_JOB_NAME =~ /status_failure/'
@@ -15,41 +17,44 @@ stages:
     - when: on_success
 
 .status_report: &status_report
-    - export context="quartz"
+    - export context="dane"
     - |
       curl --url "https://api.github.com/repos/llnl/${CI_PROJECT_NAME}/statuses/${CI_COMMIT_SHA}" \
            --header 'Content-Type: application/json' \
            --header "authorization: Bearer ${GITHUB_TOKEN}" \
            --data "{ \"state\": \"${pipeline_status}\", \"target_url\": \"${CI_PIPELINE_URL}\", \"description\": \"GitLab ${context} pipeline\", \"context\": \"ci/gitlab/${context}\" }"
 
 status_pending:
-  extends: [.on_quartz]
+  extends: [.on_dane]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report
 
 status_success:
-  extends: [.on_quartz]
+  extends: [.on_dane]
   stage: status_update
   script:
     - export pipeline_status="success"
     - *status_report
   when: on_success
 
 status_failure:
-  extends: [.on_quartz]
+  extends: [.on_dane]
   stage: status_update
   script:
     - export pipeline_status="failure"
     - *status_report
   when: on_failure
 
-# no access to msr-safe on quartz
-build-quartz:
+# no access to msr-safe on dane
+build-dane:
  tags:
    - batch
-   - quartz
+   - dane
  stage: build
  script:
    # Build and install rankstr dependency
@@ -64,20 +69,20 @@ build-quartz:
    - export HOSTNAME=`hostname`
    - echo -e "Hostname:" ${HOSTNAME}
    - groups
-   - mkdir build-gitlab-quartz && mkdir install-gitlab-quartz
-   - cd build-gitlab-quartz
-   - export HOST_CONFIG=`ls ../host-configs/quartz[email protected]`
+   - mkdir build-gitlab-dane && mkdir install-gitlab-dane
+   - cd build-gitlab-dane
+   - export HOST_CONFIG=`ls ../host-configs/dane[email protected]`
    - echo -e "HOST_CONFIG:" ${HOST_CONFIG}
    - echo -e "PWD:" ${PWD}
-   - cmake -C ${HOST_CONFIG} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install-gitlab-quartz -DBUILD_TESTS=ON -DENABLE_WARNINGS=ON -DRANKSTR_DIR=${RANKSTR_INSTALL} ../src
+   - cmake -C ${HOST_CONFIG} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install-gitlab-dane -DBUILD_TESTS=ON -DENABLE_WARNINGS=ON -DRANKSTR_DIR=${RANKSTR_INSTALL} ../src
    - make VERBOSE=1
    - make install
    #- env CTEST_OUTPUT_ON_FAILURE=1 make test
    - cd ..
    - echo -e "PWD:" ${PWD}
    - which cmake
    - cmake --version
-   - cd install-gitlab-quartz/examples/using-with-cmake/c
+   - cd install-gitlab-dane/examples/using-with-cmake/c
    - echo -e "PWD:" ${PWD}
    - mkdir _test_build
    - cd _test_build

.gitlab/lassen-cpu-build-and-test.yml

@@ -1,3 +1,5 @@
+include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main]
+
 stages:
   - status_initiate
   - build
@@ -25,6 +27,9 @@ stages:
 status_pending:
   extends: [.on_lassen_cpu]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report

.gitlab/lassen-cpugpu-build-and-test.yml

@@ -1,3 +1,5 @@
+include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main]
+
 stages:
   - status_initiate
   - build
@@ -25,6 +27,9 @@ stages:
 status_pending:
   extends: [.on_lassen_cpu_and_gpu]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report

.gitlab/lassen-gpu-build-and-test.yml

@@ -1,3 +1,5 @@
+include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main]
+
 stages:
   - status_initiate
   - build
@@ -25,6 +27,9 @@ stages:
 status_pending:
   extends: [.on_lassen_gpu]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report

.gitlab/subscribed-pipelines.yml

@@ -1,7 +1,9 @@
+include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main]
+
 # Trigger a build pipeline for the following systems
-quartz-build-and-test:
+dane-build-and-test:
   variables:
-    CI_MACHINE: "quartz"
+    CI_MACHINE: "dane"
   extends: [.build]
 
 corona-gpu-build-and-test:
@@ -24,7 +26,7 @@ lassen-cpu-and-gpu-build-and-test:
     CI_MACHINE: "lassen-cpugpu"
   extends: [.build]
 
-cztb2-build-and-test:
+cztb3-build-and-test:
   variables:
-    CI_MACHINE: "cztb2"
+    CI_MACHINE: "cztb3"
   extends: [.build]

host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake → host-configs/dane-toss_4_x86_64_ib-gcc@10.3.1.cmake

@@ -4,13 +4,13 @@
 # SPDX-License-Identifier: MIT
 
 # c compiler
-set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1/bin/gcc" CACHE PATH "")
+set(CMAKE_C_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1-magic/bin/gcc" CACHE PATH "")
 
 # cpp compiler
-set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1/bin/g++" CACHE PATH "")
+set(CMAKE_CXX_COMPILER "/usr/tce/packages/gcc/gcc-10.3.1-magic/bin/g++" CACHE PATH "")
 
 # fortran compiler
-set(CMAKE_Fortran_COMPILER  "/usr/tce/packages/gcc/gcc-10.3.1/bin/gfortran" CACHE PATH "")
+set(CMAKE_Fortran_COMPILER  "/usr/tce/packages/gcc/gcc-10.3.1-magic/bin/gfortran" CACHE PATH "")
 
 set(USE_MSR_SAFE_BEFORE_1_5_0 ON CACHE BOOL "")