From 15e434c997a879813df7ebbd0e405987b364cc78 Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Sat, 24 Feb 2024 23:12:44 +0100
Subject: [PATCH] restore job execution rules
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8cb5d7f7..9e772006 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -195,7 +195,7 @@ build-spack-env-on-runner:
when: always
timeout: 2 days
rules:
- - if: $CI_COMMIT_BRANCH != "spack_v0.21.1" && $CI_PIPELINE_SOURCE != "schedule" && $CI_PIPELINE_SOURCE != "merge_request_event"
+ - if: $CI_PIPELINE_SOURCE != "schedule" && $CI_PIPELINE_SOURCE != "merge_request_event"
sync-gitlab-spack-instance:
stage: build
@@ -229,7 +229,7 @@ sync-gitlab-spack-instance:
- spack_logs
when: always
rules:
- - if: ($CI_COMMIT_BRANCH == "spack_v0.21.1" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "experimental_rel" || $CI_COMMIT_BRANCH =~ /^ebrains/) && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ && $CI_PIPELINE_SOURCE != "schedule"
+ - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "experimental_rel" || $CI_COMMIT_BRANCH =~ /^ebrains/) && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ && $CI_PIPELINE_SOURCE != "schedule"
when: manual
test-gitlab-spack-instance:
--
GitLab