From 9aa7c4812d1983c0c3cdee223bbf5b73bd1c5763 Mon Sep 17 00:00:00 2001
From: Marcel Amirault <mamirault@gitlab.com>
Date: Thu, 23 Jan 2025 12:31:02 +0900
Subject: [PATCH 1/2] Remove non-docs jobs from docs pipelines

Also removes a manual job that was blocking docs
pipelines
---
 .gitlab/ci/checks.yml             | 1 -
 .gitlab/ci/operator.gitlab-ci.yml | 1 -
 .gitlab/ci/validations.yml        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.gitlab/ci/checks.yml b/.gitlab/ci/checks.yml
index cc317e2599..c60b48bc7d 100644
--- a/.gitlab/ci/checks.yml
+++ b/.gitlab/ci/checks.yml
@@ -99,7 +99,6 @@ lint_package:
     paths:
     - build
   rules:
-    - if: '$PIPELINE_TYPE == "DOCS_PIPELINE"'
     - if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
     - if: '$PIPELINE_TYPE =~ /_BRANCH_PIPELINE$/'
     - if: '$PIPELINE_TYPE == "NIGHTLY_PIPELINE"'
diff --git a/.gitlab/ci/operator.gitlab-ci.yml b/.gitlab/ci/operator.gitlab-ci.yml
index 3fd482a0cc..b9110850a7 100644
--- a/.gitlab/ci/operator.gitlab-ci.yml
+++ b/.gitlab/ci/operator.gitlab-ci.yml
@@ -6,7 +6,6 @@ trigger_operator_test:
   variables:
     CHARTS_REF: "${CI_COMMIT_SHA}"
     TRIGGER_PROJECT: "${CI_PROJECT_PATH}"
-    PIPELINE_TYPE: "${PIPELINE_TYPE}"
   inherit:
     variables: false
   rules:
diff --git a/.gitlab/ci/validations.yml b/.gitlab/ci/validations.yml
index 1843f5b8db..ce5971167e 100644
--- a/.gitlab/ci/validations.yml
+++ b/.gitlab/ci/validations.yml
@@ -20,7 +20,6 @@
       --output json
       .
   rules:
-    - if: '$PIPELINE_TYPE == "DOCS_PIPELINE"'
     - if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
     - if: '$PIPELINE_TYPE =~ /_BRANCH_PIPELINE$/'
     - if: '$PIPELINE_TYPE == "NIGHTLY_PIPELINE"'
-- 
GitLab


From d6c2dec5933845907868190967884f382720d3fb Mon Sep 17 00:00:00 2001
From: Marcel Amirault <mamirault@gitlab.com>
Date: Fri, 24 Jan 2025 15:57:15 +0900
Subject: [PATCH 2/2] Move docs skip with reference

---
 .gitlab/ci/operator.gitlab-ci.yml | 3 +--
 .gitlab/ci/rules.gitlab-ci.yml    | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/operator.gitlab-ci.yml b/.gitlab/ci/operator.gitlab-ci.yml
index b9110850a7..dddab8d1eb 100644
--- a/.gitlab/ci/operator.gitlab-ci.yml
+++ b/.gitlab/ci/operator.gitlab-ci.yml
@@ -9,7 +9,6 @@ trigger_operator_test:
   inherit:
     variables: false
   rules:
-    - if: '$PIPELINE_TYPE == "DOCS_PIPELINE"'
-      when: never
+    - !reference [.rule:skip_docs_pipeline]
     - !reference [.rule:skip_if_fork]
     - when: manual
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 78e6879289..aaf96e040b 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -86,3 +86,7 @@ workflow:
 .rule:skip_if_fork:
     - if: '$CI_SERVER_HOST != "gitlab.com" && $CI_PROJECT_PATH != $CANONICAL_PROJECT_PATH'
       when: never
+
+.rule:skip_docs_pipeline:
+    - if: '$CI_COMMIT_BRANCH =~ /(^docs-|-docs$|^docs\/)/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /(^docs-|-docs$|^docs\/)/'
+      when: never
-- 
GitLab