From 53d0164a448bf2e431b92d665af95694b5a4d76d Mon Sep 17 00:00:00 2001 From: Eleni Mathioulaki <emathioulaki@athenarc.gr> Date: Thu, 28 Sep 2023 00:15:28 +0200 Subject: [PATCH] restore CI job rules --- .gitlab-ci.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8db1225b..8a72b92a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,8 +59,7 @@ deploy-int-release-dev-cscs: RELEASE_NAME: EBRAINS-test resource_group: shared-NFS-mount-dev-cscs-spack20 rules: - - if: $CI_PROJECT_NAMESPACE =~ /technical-coordination/ - # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ # Deploy the production release of tools (manual pipeline) # deploy on the production environment of the okd prod cluster at CSCS @@ -193,11 +192,9 @@ build-spack-env-on-runner: - spack_logs when: always timeout: 2 days - rules: - - if: $CI_COMMIT_BRANCH != "spack-v0.20.0" - # except: - # variables: - # - $CI_PIPELINE_SOURCE == "schedule" + except: + variables: + - $CI_PIPELINE_SOURCE == "schedule" sync-gitlab-spack-instance: stage: build @@ -226,6 +223,5 @@ sync-gitlab-spack-instance: - spack_logs when: always rules: - # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ - - if: $CI_PROJECT_NAMESPACE =~ /technical-coordination/ + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ when: manual -- GitLab