From 90219eb4511719d829f3260c757725cb4bcbeb08 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 17 May 2024 15:58:21 +0200 Subject: [PATCH 1/4] Set the CI to trigger CHAI with update umpire dependency --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a72aec9e..bf0ad0f93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive ##### PROJECT VARIABLES + MP_BRANCH: "woptim/multi-project-ci" # We build the projects in the CI clone directory. # Used in script/gitlab/build_and_test.sh script. # TODO: add a clean-up mechanism. @@ -79,6 +80,19 @@ stages: forward: pipeline_variables: true +# If testing develop branch, trigger RAJAPerf pipeline with this version of +trigger-chai: + stage: multi-project + rules: + - if: $CI_COMMIT_BRANCH == ${MP_BRANCH} + when: on_success + - when: never + variables: + UPDATE_RAJA: ${MP_BRANCH} + trigger: + project: radiuss/chai + branch: develop + include: - project: 'lc-templates/id_tokens' file: 'id_tokens.yml' From a4cdfca60bb107ebffd029c1125c4ed1cff58c82 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 17 May 2024 16:09:30 +0200 Subject: [PATCH 2/4] Fix attempt --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf0ad0f93..b5ee8027c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,7 @@ stages: trigger-chai: stage: multi-project rules: - - if: $CI_COMMIT_BRANCH == ${MP_BRANCH} + - if: $CI_COMMIT_BRANCH == $MP_BRANCH when: on_success - when: never variables: From de097403928d7bf32bb7146d1d40187587c3a3e0 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Fri, 17 May 2024 22:36:02 +0200 Subject: [PATCH 3/4] Fix variable name --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5ee8027c..3b9d2cfd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ stages: forward: pipeline_variables: true -# If testing develop branch, trigger RAJAPerf pipeline with this version of +# If testing develop branch, trigger CHAI pipeline with this version of Umpire trigger-chai: stage: multi-project rules: @@ -88,7 +88,7 @@ trigger-chai: when: on_success - when: never variables: - UPDATE_RAJA: ${MP_BRANCH} + UPDATE_UMPIRE: ${MP_BRANCH} trigger: project: radiuss/chai branch: develop From 646cd78aa231ea08c0d047db52c5f8bc22304d17 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:06:37 +0200 Subject: [PATCH 4/4] Add a way to switch off multi project pipelines --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b716e4ba0..1a84d10a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,7 @@ stages: trigger-chai: stage: multi-project rules: - - if: $CI_COMMIT_BRANCH == $MP_BRANCH + - if: $CI_COMMIT_BRANCH == $MP_BRANCH && $MULTI_PROJECT != "OFF" when: on_success - when: never variables: