diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cadf39aa629054b2c815fd0d094aeb5f95beda6..b4d7136544246de90a12bbbfdb7010740359f625 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -187,10 +187,6 @@ upgrade: .infra fork: stage: network up rules: - # run infrastructure pipelines only on merges into release branches, and run regardless of failure - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^release*/' - allow_failure: false - when: manual # Run on scheduled jobs - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "master"' allow_failure: false @@ -198,18 +194,12 @@ upgrade: # Abstract for jobs responsible for creating infrastructure .infra create: rules: - # run infrastructure pipelines only on merges into release branches - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^release*/' # Run on scheduled jobs - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "master"' # Abstract for jobs responsible for cleaning up infrastructure .infra cleanup: rules: - # run infrastructure pipelines only on merges into release branches, and run regardless of failure - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^release*/' - allow_failure: true - when: always # Run on scheduled jobs - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "master"' allow_failure: true