From 2a99eb5d092a136e02a2260bd8d5807d9727af0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= <pspacek@isc.org>
Date: Thu, 25 Sep 2025 14:24:45 +0200
Subject: [PATCH] Apply special git tag rules only in the private project

We do not want to re-release tags we create in the private project
anyway. Moreover pushing tags back into the public project after release
caused to Gitlab to create tag pipelines which never finished, which was
only confusing thing.

(cherry picked from commit 675d9c74251fee8ec034e87bdd43e7da97119a5d)
---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5deec2b2be..f5c4f53ea1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -307,7 +307,7 @@ stages:
     allow_failure: true  # don't block the pipeline or the pipeline result
 
 .rule_tag: &rule_tag
-  - if: '$CI_COMMIT_TAG != null'
+  - if: '$CI_PROJECT_NAMESPACE == "isc-private" && $CI_COMMIT_TAG != null'
 
 .rule_source_other_than_mr: &rule_source_other_than_mr
   - if: '$CI_PIPELINE_SOURCE =~ /^(api|pipeline|schedule|trigger|web)$/ && $REBASE_ONLY != "1"'
@@ -499,7 +499,7 @@ stages:
       when: manual  # don't run on each MR unless requested
       allow_failure: true
     # - &shotgun_rule_tag
-    #   if: '$CI_COMMIT_TAG != null'
+    #   if: '$CI_PROJECT_NAMESPACE == "isc-private" && $CI_COMMIT_TAG != null'
     #   variables:
     #     SHOTGUN_ROUNDS: 3
     # - &shotgun_rule_other
@@ -1757,7 +1757,7 @@ release:
     - job: docs
       artifacts: true
   rules:
-    - if: '$CI_COMMIT_TAG != null'
+    - *rule_tag
   artifacts:
     paths:
       - "*-release"
@@ -1801,7 +1801,7 @@ sign:
     - job: release
       artifacts: true
   rules:
-    - if: '$CI_COMMIT_TAG != null'
+    - *rule_tag
   when: manual
   allow_failure: false
 
@@ -1879,7 +1879,7 @@ customer-git:tag:
     - job: release
       artifacts: false
   rules:
-    - if: '$CI_PROJECT_NAMESPACE == "isc-private" && $CI_COMMIT_TAG != null'
+    - *rule_tag
   before_script:
     - git clone --depth 1 https://gitlab.isc.org/isc-projects/bind9-qa.git
     - git clone --depth 1 "https://token:${ISC_CUSTOMERS_WRITE_TOKEN}@gitlab.isc.org/isc-customers/isc-customer-settings.git"
@@ -2074,7 +2074,7 @@ stress-test-child-pipeline:
     - if: '$CI_MERGE_REQUEST_DIFF_BASE_SHA != null'
       when: manual  # don't run on each MR unless requested
       allow_failure: true
-    - if: '$CI_COMMIT_TAG != null'
+    - *rule_tag
     - if: '$CI_PIPELINE_SOURCE =~ /^(api|pipeline|schedule|trigger|web)$/ && $REBASE_ONLY != "1"'
   trigger:
     include: