]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Run merged-metadata job for release branches in private repo
authorNicki Křížek <nicki@isc.org>
Mon, 27 Jan 2025 14:30:39 +0000 (15:30 +0100)
committerNicki Křížek <nicki@isc.org>
Tue, 28 Jan 2025 13:34:18 +0000 (14:34 +0100)
The prior regex didn't match the actual names we use for release
branches in the private repo. This caused the merged-metadata job to not
be created upon merging to a release branch, resulting in the private MR
not being properly milestoned.

Use the correct regex along with protecting the v9.*-release branches in
the gitlab UI so that they have access to the token used to perform the
required API operations.

.gitlab-ci.yml

index 8ab95af2956a182c248d888de55cfd2756a32fd0..be5c0ed73c8770c757d337e6d368f6c4fc238ae8 100644 (file)
@@ -1827,6 +1827,6 @@ backports:
 merged-metadata:
   <<: *post_merge
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME =~ /^bind-9.[0-9]+(-sub)?$/ || $CI_COMMIT_REF_NAME =~ /^bind-9.[0-9]+.[0-9]+-release$/ || $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH)'
+    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME =~ /^bind-9.[0-9]+(-sub)?$/ || $CI_COMMIT_REF_NAME =~ /^v9.[0-9]+.[0-9]+-release$/ || $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH)'
   script:
     - bind9-qa/releng/after_merge.py "$CI_PROJECT_ID" "$MERGE_REQUEST_ID"