ci: only run on infra jobs on scheduled triggers or release branches

.gitlab-ci.yml

@@ -181,31 +181,31 @@ upgrade:
 .infra fork:
   stage: network up
   rules:
-    # skip job when branch name starts with "hotfix" or "patch"
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^(hotfix|patch)/'
-      when: never
-    # run infrastructure pipelines only on merges into master, and run regardless of failure
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+    # 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
 
 # Abstract for jobs responsible for creating infrastructure
 .infra create:
   rules:
-    # skip job when branch name starts with "hotfix" or "patch"
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^(hotfix|patch)/'
-      when: never
-    # run infrastructure pipelines only on merges into master
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+    # 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:
-    # skip job when branch name starts with "hotfix" or "patch"
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^(hotfix|patch)/'
-      when: never
-    # run infrastructure pipelines only on merges into master, and run regardless of failure
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+    # 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
       when: always
 
@@ -346,9 +346,6 @@ package:
   rules:
     # run job for manual tag events
     - if: $CI_COMMIT_TAG
-    #   when: never
-    # # run job on commits to default branch
-    # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   before_script:
     # Set up auth
     - mkdir -p /root/.docker
@@ -381,9 +378,6 @@ release:
   rules:
     # run job for manual tag events
     - if: $CI_COMMIT_TAG
-    #   when: never
-    # # run job on commits to default branch
-    # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   variables:
     RELEASE_ENDPOINT: https://${RELEASE_BUCKET}.s3-${AWS_DEFAULT_REGION}.amazonaws.com/umbrella/${CI_COMMIT_TAG}
   script: