From 406cbcaaa8e46c1592914e844b0185d886719349 Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Fri, 20 Sep 2024 14:21:45 -0700 Subject: [PATCH 1/6] more changes --- .gitlab/cztb2-build-and-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/cztb2-build-and-test.yml b/.gitlab/cztb2-build-and-test.yml index 71662db..ec35037 100644 --- 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 From c6c29ab577d9a53ec8e9c07a59a3dd19f029c56d Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Fri, 20 Sep 2024 14:39:34 -0700 Subject: [PATCH 2/6] fix --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d99b06..9a15d65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ -include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main] +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/msr/gitlab-runner" @@ -19,4 +21,3 @@ stages: pipeline_variables: true include: - - local: .gitlab/subscribed-pipelines.yml From 0aae702f1bc8fb13808d2626dc2bcf8b4fedb081 Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Fri, 20 Sep 2024 14:46:34 -0700 Subject: [PATCH 3/6] remove extra include --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a15d65..96525aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,5 +19,3 @@ stages: strategy: depend forward: pipeline_variables: true - -include: From 67f85d5187a330cc0973fc8a57d8b5591b3860ad Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Fri, 20 Sep 2024 15:02:00 -0700 Subject: [PATCH 4/6] add to subscribed pipelines --- .gitlab/subscribed-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml index b684125..6cd1eb2 100644 --- 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 cztb2-build-and-test: variables: From b50c7ea777a5addff176bfb8507bb06a6476b390 Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Fri, 20 Sep 2024 15:11:09 -0700 Subject: [PATCH 5/6] edit cztb2 --- .gitlab/cztb2-build-and-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/cztb2-build-and-test.yml b/.gitlab/cztb2-build-and-test.yml index ec35037..57d6c4b 100644 --- a/.gitlab/cztb2-build-and-test.yml +++ b/.gitlab/cztb2-build-and-test.yml @@ -30,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 From 6539905cdcb35d1ad7b1db646a5419021c5edd91 Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Fri, 27 Sep 2024 13:02:51 -0700 Subject: [PATCH 6/6] move cztb2 to cztb3 --- ...-and-test.yml => cztb3-build-and-test.yml} | 22 +++++++++---------- .gitlab/subscribed-pipelines.yml | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) rename .gitlab/{cztb2-build-and-test.yml => cztb3-build-and-test.yml} (89%) diff --git a/.gitlab/cztb2-build-and-test.yml b/.gitlab/cztb3-build-and-test.yml similarity index 89% rename from .gitlab/cztb2-build-and-test.yml rename to .gitlab/cztb3-build-and-test.yml index 57d6c4b..e3d1625 100644 --- a/.gitlab/cztb2-build-and-test.yml +++ b/.gitlab/cztb3-build-and-test.yml @@ -5,10 +5,10 @@ stages: - 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/' @@ -17,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' \ @@ -27,8 +27,8 @@ stages: status_pending: tags: - shell - - cztb2 - extends: [.on_cztb2] + - cztb3 + extends: [.on_cztb3] stage: status_initiate id_tokens: CI_JOB_JWT: @@ -40,8 +40,8 @@ status_pending: status_success: tags: - shell - - cztb2 - extends: [.on_cztb2] + - cztb3 + extends: [.on_cztb3] stage: status_update script: - export pipeline_status="success" @@ -51,8 +51,8 @@ status_success: status_failure: tags: - shell - - cztb2 - extends: [.on_cztb2] + - cztb3 + extends: [.on_cztb3] stage: status_update script: - export pipeline_status="failure" @@ -60,10 +60,10 @@ status_failure: when: on_failure # build across power lab -build-cztb2: +build-cztb3: tags: - shell - - cztb2 + - cztb3 stage: build script: - git clone $MSR_SAFE_ANSIBLE diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml index 6cd1eb2..ed11077 100644 --- a/.gitlab/subscribed-pipelines.yml +++ b/.gitlab/subscribed-pipelines.yml @@ -1,7 +1,7 @@ include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main] # Trigger a build pipeline for the following systems -cztb2-build-and-test: +cztb3-build-and-test: variables: - CI_MACHINE: "cztb2" + CI_MACHINE: "cztb3" extends: [.build]