From 91267eee58bbca3253a51bb12c618d8399026ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= <stepan@isc.org>
Date: Thu, 26 Jun 2025 16:10:29 +0200
Subject: [PATCH 1/3] Don't redifine stage:precheck in ci-variables job
 definition

The value is defined in the *precheck_job anchor.

(cherry picked from commit 9331451c5f38d912de07c34fa2a570416818c661)
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54bac6957f..aba604b7c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -602,7 +602,6 @@ vulture:
     - vulture --exclude "*ans.py,conftest.py,isctest" --ignore-names "pytestmark" bin/tests/system/
 
 ci-variables:
-  stage: precheck
   <<: *precheck_job
   script:
     - export BIND_BASELINE_BRANCH="$(sed -n -E "s|^m4_define\(\[bind_VERSION_MINOR\], ([0-9]+)\)dnl$|\1|p" configure.ac)"

From cbc113ecb9abfb355ab3bd62dff4035652a9c988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= <stepan@isc.org>
Date: Thu, 26 Jun 2025 16:15:45 +0200
Subject: [PATCH 2/3] Add a check for defined but never used anchors in
 .gitlab-ci.yaml

If a anchor is ever orphaned, this will fail in CI.

(cherry picked from commit 5ed2b6c08099f6f21021cbe740d76cd593292121)
---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aba604b7c8..3757a7fc4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -617,6 +617,16 @@ ci-variables:
     reports:
       dotenv: ci_vars.env
 
+ci-orphaned-anchors:
+  <<: *precheck_job
+  script:
+    - git clone --depth 1 https://gitlab.isc.org/isc-projects/bind9-qa.git
+    - bind9-qa/ci-orphaned-anchors/check-orphaned-anchors-ci.py .gitlab-ci.yml
+  needs: []
+  rules:
+    - changes:
+        - .gitlab-ci.yml
+
 clang-format:
   <<: *precheck_job
   needs: []

From 5602c2565f61b269d5a3f359f65a72d0ee938415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= <stepan@isc.org>
Date: Thu, 26 Jun 2025 16:46:27 +0200
Subject: [PATCH 3/3] Remove orphaned anchors in .gitlab-ci.yml

These were left there after previous refactors.

(cherry picked from commit 919f5d6419edfd99a184a8eb72ca50dc4812eb7d)
---
 .gitlab-ci.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3757a7fc4f..1635f90e2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -261,10 +261,6 @@ stages:
     - if: '$CI_PIPELINE_SOURCE =~ /^(api|pipeline|schedule|trigger|web)$/'
     - if: '$CI_COMMIT_TAG != null'
 
-.api-pipelines-schedules-triggers-web-triggering-rules: &api_pipelines_schedules_triggers_web_triggering_rules
-  rules:
-    - if: '$CI_PIPELINE_SOURCE =~ /^(api|pipeline|schedule|trigger|web)$/'
-
 .default-triggering-rules_list: &default_triggering_rules_list
   - if: '$CI_PIPELINE_SOURCE =~ /^(api|merge_request_event|pipeline|schedule|trigger|web)$/'
   - if: '$CI_COMMIT_TAG != null'
@@ -393,8 +389,7 @@ stages:
   <<: *base_image
   stage: performance
   rules:
-    - &shotgun_rule_mr
-      if: '$CI_MERGE_REQUEST_DIFF_BASE_SHA != null'
+    - if: '$CI_MERGE_REQUEST_DIFF_BASE_SHA != null'
       variables:
         BASELINE: '$CI_MERGE_REQUEST_DIFF_BASE_SHA'
     - &shotgun_rule_tag
@@ -1782,9 +1777,6 @@ shotgun:doh-get:
     SHOTGUN_EVAL_THRESHOLD_LATENCY_PCTL_MAX: 0.4  # bump from the default due to increased tail-end jitter
   rules: *shotgun_rules_manual_mr
 
-.stress-test: &stress_test
-  stage: performance
-
 generate-stress-test-configs:
   <<: *base_image
   <<: *default_triggering_rules