From 43670a2ce2c77787969b7d5c2dc0f89cfd713a74 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 b1571eb077..e890dd9110 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 f69c89852ae2185950c8cbd453336e7205922ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Thu, 23 Jan 2025 14:29:12 +0100
Subject: [PATCH 2/2] Inherit PIPELINE_TYPE variable in trigger_operator_test

If we keep setting inherit to false, there's no way we can use that
default variable as part of our rules definition.
---
 .gitlab/ci/operator.gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab/ci/operator.gitlab-ci.yml b/.gitlab/ci/operator.gitlab-ci.yml
index e890dd9110..cdfe5489d2 100644
--- a/.gitlab/ci/operator.gitlab-ci.yml
+++ b/.gitlab/ci/operator.gitlab-ci.yml
@@ -7,7 +7,8 @@ trigger_operator_test:
     CHARTS_REF: "${CI_COMMIT_SHA}"
     TRIGGER_PROJECT: "${CI_PROJECT_PATH}"
   inherit:
-    variables: false
+    variables: 
+      - PIPELINE_TYPE
   rules:
     - if: '$PIPELINE_TYPE == "DOCS_PIPELINE"'
       when: never
-- 
GitLab