From cb8e0d7d47b73f40bd89f17752ffd71634c643cf Mon Sep 17 00:00:00 2001
From: Sebastian Achilles <s.achilles@fz-juelich.de>
Date: Sat, 18 Feb 2023 14:31:49 +0100
Subject: [PATCH] CI: update rules and add all system to ACL update
---
.gitlab-ci.yml | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58558dca7..8595a9e02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,8 +121,8 @@ sync_repo_on_HPC:
- cd /p/fastdata/zam/swmanage/EasyBuild/2023
- hostname
- git pull https://project_2497_bot1:$GITLAB_TOKEN@gitlab.jsc.fz-juelich.de/software-team/easybuild.git
- only:
- - '2023'
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
update_acls:
stage: deploy
@@ -130,8 +130,10 @@ update_acls:
matrix:
- SYSTEM:
- juwels
+ - juwels_boster
- jureca
- jusuf
+ - hdfml
tags:
- jacamar
- ${SYSTEM}
@@ -142,8 +144,9 @@ update_acls:
- ml Stages/2023
- pushd /p/fastdata/zam/swmanage/EasyBuild/$STAGE/bin
- ./setacls -c ../acls.yml --force -m
- only:
- changes:
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - changes:
- 'acls.yml'
push_public_mirror:
@@ -162,8 +165,8 @@ push_public_mirror:
- git add -A
- git commit -a -m "Sync"
- git push https://$GITHUB_USER:$GITHUB_TOKEN@github.com/easybuilders/JSC.git
- only:
- - '2023'
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
when: manual
pull_public_mirror:
@@ -176,5 +179,5 @@ pull_public_mirror:
- hostname
- cd /p/usersoftware/swmanage/user_installations/2023/
- git pull
- only:
- - '2023'
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
--
GitLab