Skip to content
Snippets Groups Projects
Commit 7afe6a1d authored by Sebastian Achilles's avatar Sebastian Achilles
Browse files

Merge branch 'sa-CI' into '2023' 

enhance CI script

See merge request software-team/easybuild!1896
parents 554993ab b5ef0567
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 10 additions and 11 deletions
.gitlab-ci.yml
+ 10
− 11
View file @ 7afe6a1d
...@@ -120,12 +120,11 @@ sync_repo_on_HPC: ...@@ -120,12 +120,11 @@ sync_repo_on_HPC:
- jacamar - jacamar
- shell - shell
script: script:
- cd /p/fastdata/zam/swmanage/EasyBuild/2023 - cd /p/fastdata/zam/swmanage/EasyBuild/$TARGET_BRANCH
- hostname - hostname
- echo 'Runung as '+$USERNAME - git pull https://$GITLAB_USER:$GITLAB_TOKEN@gitlab.jsc.fz-juelich.de/software-team/easybuild.git $TARGET_BRANCH
- git pull https://$GITLAB_USER:$GITLAB_TOKEN@gitlab.jsc.fz-juelich.de/software-team/easybuild.git
rules: 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: update_acls:
stage: deploy stage: deploy
...@@ -144,11 +143,11 @@ update_acls: ...@@ -144,11 +143,11 @@ update_acls:
needs: ['sync_repo_on_HPC'] needs: ['sync_repo_on_HPC']
script: script:
- hostname - hostname
- ml Stages/2023 - ml Stages/$TARGET_BRANCH
- pushd /p/fastdata/zam/swmanage/EasyBuild/$STAGE/bin - pushd /p/fastdata/zam/swmanage/EasyBuild/$STAGE/bin
- ./setacls -c ../acls.yml --force -m - ./setacls -c ../acls.yml --force -m
rules: 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: changes:
- 'acls.yml' - 'acls.yml'
...@@ -161,15 +160,15 @@ push_public_mirror: ...@@ -161,15 +160,15 @@ push_public_mirror:
needs: ['sync_repo_on_HPC'] needs: ['sync_repo_on_HPC']
script: script:
- hostname - hostname
- ml Stages/2023 - ml Stages/$TARGET_BRANCH
- cd /p/project/cswmanage/easybuilders-JSC/2023 - cd /p/project/cswmanage/easybuilders-JSC/$TARGET_BRANCH
- git pull - git pull
- ./filter.sh - ./filter.sh
- git add -A - git add -A
- git commit -a -m "Sync" - git commit -a -m "Sync"
- git push https://$GITHUB_USER:$GITHUB_TOKEN@github.com/easybuilders/JSC.git - git push https://$GITHUB_USER:$GITHUB_TOKEN@github.com/easybuilders/JSC.git
rules: 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 when: manual
pull_public_mirror: pull_public_mirror:
...@@ -179,7 +178,7 @@ pull_public_mirror: ...@@ -179,7 +178,7 @@ pull_public_mirror:
- shell - shell
script: script:
- hostname - hostname
- cd /p/usersoftware/swmanage/user_installations/2023/ - cd /p/usersoftware/swmanage/user_installations/$TARGET_BRANCH/
- git pull - git pull
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_PROJECT_NAMESPACE == "software-team" && $CI_COMMIT_BRANCH == $TARGET_BRANCH'
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment