Merge branch 'simplify-pipeline-rules-3' into 'main'

Start using pipelines names in rules

See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3627

Merged-by: Sarah German <sgerman@gitlab.com>
Approved-by: Sarah German <sgerman@gitlab.com>
Reviewed-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Marcel Amirault <mamirault@gitlab.com>

6 files changed, 39 insertions, 34 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42a4d328..a48958ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,14 @@ workflow:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       variables:
         DOCS_PROJECT_PIPELINE_TYPE: "MR pipeline: branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME =~ /algolia/'
+      variables:
+        DOCS_PROJECT_PIPELINE_TYPE: "MR pipeline (Algolia): branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
+        SEARCH_BACKEND: 'algolia'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME =~ /gps/'
+      variables:
+        DOCS_PROJECT_PIPELINE_TYPE: "MR pipeline (Google): branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
+        SEARCH_BACKEND: 'google'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $PIPELINE_SCHEDULE_TIMING == "monthly"'
       variables:
         DOCS_PROJECT_PIPELINE_TYPE: "Monthly stopped environments cleanup pipeline"
@@ -57,7 +65,7 @@ workflow:
         DOCS_PROJECT_PIPELINE_TYPE: "Pipeline source = pipeline"
     - if: '$CI_PIPELINE_SOURCE == "trigger"'
       variables:
-        DOCS_PROJECT_PIPELINE_TYPE: "Review app pipeline"
+        DOCS_PROJECT_PIPELINE_TYPE: "Upstream review app pipeline"
     # Allow branch pipelines for the default branch and stable branches named XX.X
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       variables:
diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml
index 5028214c..a61648bc 100644
--- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml
+++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml
@@ -115,8 +115,8 @@ review:
       when: manual
     - if: '$CI_PROJECT_PATH !~ /^gitlab-org/'
       when: never
-    - if: '$CI_MERGE_REQUEST_ID'
-    - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
     - if: '$CI_COMMIT_BRANCH =~ /docs-preview/'  # TODO: Remove once no projects create such branch
 
 #
@@ -143,7 +143,10 @@ review_stop:
       when: manual
     - if: '$CI_PROJECT_PATH !~ /^gitlab-org/'
       when: never
-    - if: '$CI_MERGE_REQUEST_ID || $CI_PIPELINE_SOURCE == "pipeline"|| $CI_PIPELINE_SOURCE == "trigger"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
+      allow_failure: true
+      when: manual
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
       allow_failure: true
       when: manual
     # TODO: Remove once no projects create such branch
@@ -161,7 +164,7 @@ delete_stopped_environments:
   before_script: []
   dependencies: []
   rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE_SCHEDULE_TIMING == "monthly"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Monthly stopped environments cleanup pipeline"'
   stage: test
   script:
     - apk --update add curl jq
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml
index 1c9ded55..af0938b3 100644
--- a/.gitlab/ci/docker-images.gitlab-ci.yml
+++ b/.gitlab/ci/docker-images.gitlab-ci.yml
@@ -166,7 +166,7 @@ image:docs-single:
     - docker push $IMAGE_NAME
   # Only branches with versions like 10.4
   rules:
-    - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"'
 
 #
 # Test the GitLab docs single version Docker image if changes made to its Dockerfile
@@ -219,7 +219,7 @@ image:docs-single-lunrjs:
     - docker push $IMAGE_NAME
   # Only branches with versions like 10.4
   rules:
-    - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"'
 
 #
 # Test the GitLab docs single version Docker image with lunr.js enabled
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 66c72a9c..9704538f 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -63,7 +63,7 @@ default:
 #
 .rules_docker_images:
   rules:
-    - if: $CHORES_PIPELINE == "true"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
       when: never
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: manual
@@ -71,59 +71,53 @@ default:
 
 .rules_docker_image_tests:
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
       changes:
         - $DOCKERFILE
 
 .rules_chores:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CHORES_PIPELINE == "true"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
       when: manual
       allow_failure: true
 
 .rules_site_tests:
   rules:
-    - if: $CHORES_PIPELINE == "true"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
       when: never
     # Don't run site tests for review apps.
-    - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
       when: never
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
-    - if: '$CI_MERGE_REQUEST_ID'
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"'
 
 .rules_prod:
   rules:
-    - if: $CHORES_PIPELINE == "true"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
       when: never
     # Don't deploy to production for trigerred pipelines (usually review apps)
-    - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"'
 
 .rules_dev:
   rules:
-    - if: $CI_MERGE_REQUEST_ID && $CI_COMMIT_REF_NAME =~ /algolia/
-      variables:
-        SEARCH_BACKEND: 'algolia'
-    - if: $CI_MERGE_REQUEST_ID && $CI_COMMIT_REF_NAME =~ /gps/
-      variables:
-        SEARCH_BACKEND: 'google'
-    - if: '$CI_MERGE_REQUEST_ID'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
     - if: '$CI_COMMIT_BRANCH =~ /docs-preview/'  # TODO: Remove once no projects create such branch
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CHORES_PIPELINE == "true"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
 
 .rules_upstream_review_app:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
 
 .rules_pages:
   rules:
-    - if: $CHORES_PIPELINE == "true"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
       when: never
     # Don't deploy to production for trigerred pipelines (usually review apps)
-    - if: '$CI_PIPELINE_SOURCE == "pipeline"|| $CI_PIPELINE_SOURCE == "trigger"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"'
diff --git a/.gitlab/ci/security.gitlab-ci.yml b/.gitlab/ci/security.gitlab-ci.yml
index e8ec2837..53b1f94e 100644
--- a/.gitlab/ci/security.gitlab-ci.yml
+++ b/.gitlab/ci/security.gitlab-ci.yml
@@ -59,7 +59,7 @@ secret_detection:
   rules:
     - if: $SECRET_DETECTION_DISABLED
       when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
   script:
     - /analyzer run
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml
index 1bed0ec1..aafffe72 100644
--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@@ -63,7 +63,7 @@ check_asdf_installation:
     - make setup-asdf
     - make install-asdf-dependencies
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
       changes:
         - .tool-versions