apply reviewer suggestions
authorM. Eric Irrgang <mei2n@virginia.edu>
Thu, 24 Jun 2021 14:50:08 +0000 (14:50 +0000)
committerPaul Bauer <paul.bauer.q@gmail.com>
Fri, 25 Jun 2021 07:45:45 +0000 (07:45 +0000)
admin/gitlab-ci/rules.gitlab-ci.yml

index 0cccb7939c858d251da1a594bb75b491e83803df..2fe5cb641cb0cd4a54f93d0a3b3698e7357d0196 100644 (file)
@@ -32,7 +32,7 @@
   when: never
 
 # Include in pipelines triggered through the web interface.
-.rules-element:if-web-then-always: &if-web-then-always
+.rules-element:if-web-then-on-success: &if-web-then-on-success
   if: '$CI_PIPELINE_SOURCE == "web"'
   when: on_success
 
   when: never
 
 # Include in pipelines triggered by "push" events to any branch.
-.rules-element:if-push-then-always: &if-push-then-always
+.rules-element:if-push-then-on-success: &if-push-then-on-success
   if: '$CI_PIPELINE_SOURCE == "push"'
   when: on_success
 
 # Include in "schedule" pipelines (e.g. nightly jobs)
-.rules-element:if-schedule-then-always: &if-schedule-then-always
+.rules-element:if-schedule-then-on-success: &if-schedule-then-on-success
   if: '$CI_PIPELINE_SOURCE == "schedule"'
   when: on_success
 
@@ -58,7 +58,7 @@
   when: never
 
 # Include in pipelines triggered in the merge request process.
-.rules-element:if-mr-then-always: &if-mr-then-always
+.rules-element:if-mr-then-on-success: &if-mr-then-on-success
   if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
   when: on_success
 
   when: never
 
 # Include job when running for merge request or when pushing to protected branch.
-.rules-element:if-post-merge-acceptance-or-mr-then-always: &if-post-merge-acceptance-or-mr-then-always
+.rules-element:if-post-merge-acceptance-or-mr-then-on-success: &if-post-merge-acceptance-or-mr-then-on-success
   if: '$CI_PIPELINE_SOURCE == "merge_request_event" ||
        ($CI_PIPELINE_SOURCE == "push" &&
         $CI_COMMIT_REF_NAME == "master")'
   when: on_success
 
 # Include job only for post submit push
-.rules-element:if-post-merge-acceptance-then-always: &if-post-merge-acceptance-then-always
+.rules-element:if-post-merge-acceptance-then-on-success: &if-post-merge-acceptance-then-on-success
   if: '$CI_PIPELINE_SOURCE == "push" &&
        $CI_COMMIT_REF_NAME == "master"'
   when: on_success
     - *if-release-then-never
     - *if-mr-then-never
     - *if-post-merge-acceptance-then-never
-    - *if-web-then-always
-    - *if-push-then-always
-    - *if-schedule-then-always
+    - *if-web-then-on-success
+    - *if-push-then-on-success
+    - *if-schedule-then-on-success
 
 # Jobs to run after successful merge of a new commit.
 # Only run on GROMACS infrastructure and only when merging into
     - *if-not-gromacs-then-never
     - *if-release-then-never
     - *if-mr-then-never
-    - *if-post-merge-acceptance-then-always
-    - *if-web-then-always
-    - *if-schedule-then-always
+    - *if-post-merge-acceptance-then-on-success
+    - *if-web-then-on-success
+    - *if-schedule-then-on-success
 
 # Jobs that run for merge requests and schedules, but not when GROMACS_RELEASE
 # is set. Excludes non-GROMACS projects.
     - *if-release-then-never
     - *if-push-then-never
     - *if-post-merge-acceptance-then-never
-    - *if-web-then-always
-    - *if-schedule-then-always
-    - *if-mr-then-always
+    - *if-web-then-on-success
+    - *if-schedule-then-on-success
+    - *if-mr-then-on-success
 
 # Jobs running both in post submit and for merge requests
 # Excludes non-GROMACS projects.
   rules:
     - *if-not-gromacs-then-never
     - *if-release-then-never
-    - *if-web-then-always
-    - *if-schedule-then-always
-    - *if-post-merge-acceptance-or-mr-then-always
+    - *if-web-then-on-success
+    - *if-schedule-then-on-success
+    - *if-post-merge-acceptance-or-mr-then-on-success
 
 # Jobs that run for merge requests and schedules for branch `master`,
 # but not when GROMACS_RELEASE is set.
     - *if-not-gromacs-then-never
     - *if-release-then-never
     - *if-post-merge-acceptance-then-never
-    - *if-web-then-always
+    - *if-web-then-on-success
     # This rule catches "push" and other events in branches other than `master`
     # but allows merge_request_events for merge requests targeting master.
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master" && $CI_COMMIT_REF_NAME != "master"'
       when: never
-    - *if-schedule-then-always
-    - *if-mr-then-always
+    - *if-schedule-then-on-success
+    - *if-mr-then-on-success
 
 # Jobs that run for merge requests and schedules for branch `release-2021`,
 # but not when GROMACS_RELEASE is set.
     # to be provided through the web interface.
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "release-2021" && $CI_COMMIT_REF_NAME != "release-2021"'
       when: never
-    - *if-web-then-always
-    - *if-schedule-then-always
-    - *if-mr-then-always
+    - *if-web-then-on-success
+    - *if-schedule-then-on-success
+    - *if-mr-then-on-success
 
 # Jobs that run for merge requests and schedules for branch `release-2020`,
 # but not when GROMACS_RELEASE is set.
     # to be provided through the web interface.
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "release-2020" && $CI_COMMIT_REF_NAME != "release-2020"'
       when: never
-    - *if-web-then-always
-    - *if-schedule-then-always
-    - *if-mr-then-always
+    - *if-web-then-on-success
+    - *if-schedule-then-on-success
+    - *if-mr-then-on-success
 
 # Rule to run a job only in nightly release-preparation pipelines.
 # Checks if the GROMACS_RELEASE variable was set (typically through the GitLab web interface).
     - *if-not-gromacs-then-never
     - *if-not-release-then-never
     - *if-post-merge-acceptance-then-never
-    - *if-web-then-always
-    - *if-schedule-then-always
+    - *if-web-then-on-success
+    - *if-schedule-then-on-success
 
 # Jobs that run on schedules, but not for merge requests or when GROMACS_RELEASE
 # is set. Excludes non-gromacs projects.
     - *if-not-gromacs-then-never
     - *if-release-then-never
     - *if-post-merge-acceptance-then-never
-    - *if-web-then-always
-    - *if-schedule-then-always
+    - *if-web-then-on-success
+    - *if-schedule-then-on-success