id_tokens throughout

LLNL · Sep 20, 2024 · 214704b · 214704b
1 parent a3156ab
commit 214704b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.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,9 +19,3 @@ stages:
     strategy: depend
     forward:
       pipeline_variables: true
-
-include:
-  # Sets ID tokens for every job using `default:`
-  - project: 'lc-templates/id_tokens'
-    file: 'id_tokens.yml'
-  - local: .gitlab/subscribed-pipelines.yml
diff --git a/.gitlab/corona-gpu-build-and-test.yml b/.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

diff --git a/.gitlab/cztb2-build-and-test.yml b/.gitlab/cztb2-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
@@ -28,6 +30,9 @@ status_pending:
     - cztb2
   extends: [.on_cztb2]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report

diff --git a/.gitlab/lassen-cpu-build-and-test.yml b/.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

diff --git a/.gitlab/lassen-cpugpu-build-and-test.yml b/.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

diff --git a/.gitlab/lassen-gpu-build-and-test.yml b/.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

diff --git a/.gitlab/quartz-build-and-test.yml b/.gitlab/quartz-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_quartz]
   stage: status_initiate
+  id_tokens:
+    CI_JOB_JWT:
+      aud: https://lc.llnl.gov/gitlab
   script:
     - export pipeline_status="pending"
     - *status_report

diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml
@@ -1,3 +1,5 @@
+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:
   variables: