Merge branch 'sa-CI' into '2023'

enhance CI script

See merge request software-team/easybuild!1896

.gitlab-ci.yml

@@ -120,12 +120,11 @@ sync_repo_on_HPC:
     - jacamar
     - shell
   script:
-    - cd /p/fastdata/zam/swmanage/EasyBuild/2023
+    - cd /p/fastdata/zam/swmanage/EasyBuild/$TARGET_BRANCH
     - hostname
-    - echo 'Runung as '+$USERNAME
-    - git pull https://$GITLAB_USER:$GITLAB_TOKEN@gitlab.jsc.fz-juelich.de/software-team/easybuild.git
+    - git pull https://$GITLAB_USER:$GITLAB_TOKEN@gitlab.jsc.fz-juelich.de/software-team/easybuild.git $TARGET_BRANCH
   rules:
-    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $TARGET_BRANCH'
 
 update_acls:
   stage: deploy
@@ -144,11 +143,11 @@ update_acls:
   needs: ['sync_repo_on_HPC']
   script:
     - hostname
-    - ml Stages/2023
+    - ml Stages/$TARGET_BRANCH
     - pushd /p/fastdata/zam/swmanage/EasyBuild/$STAGE/bin
     - ./setacls -c ../acls.yml --force -m
   rules:
-    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $TARGET_BRANCH'
       changes:
       - 'acls.yml'
 
@@ -161,15 +160,15 @@ push_public_mirror:
   needs: ['sync_repo_on_HPC']
   script:
     - hostname
-    - ml Stages/2023
-    - cd /p/project/cswmanage/easybuilders-JSC/2023
+    - ml Stages/$TARGET_BRANCH
+    - cd /p/project/cswmanage/easybuilders-JSC/$TARGET_BRANCH
     - git pull
     - ./filter.sh
     - git add -A
     - git commit -a -m "Sync"
     - git push https://$GITHUB_USER:$GITHUB_TOKEN@github.com/easybuilders/JSC.git
   rules:
-    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $TARGET_BRANCH'
   when: manual
 
 pull_public_mirror:
@@ -179,7 +178,7 @@ pull_public_mirror:
     - shell
   script:
     - hostname
-    - cd /p/usersoftware/swmanage/user_installations/2023/
+    - cd /p/usersoftware/swmanage/user_installations/$TARGET_BRANCH/
     - git pull
   rules:
-    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $TARGET_BRANCH'