From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Thu, 9 Nov 2023 17:36:15 +0000 (-0800)
Subject: Fix: Update release jobs triggers
X-Git-Tag: v0.89.5~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F72359%2F3;p=releng%2Fglobal-jjb.git

Fix: Update release jobs triggers

Currently, all active branches verify jobs are triggering
causing verify conflicts when projects are releasing more
than one branch simultaniously.
Update triggers to only trigger the branch in question.

Issue: RELENG-4979
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: Ifff3470671df4b6d05d78575d809c1befa7056de
---

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index d7361595..285e570b 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -132,7 +132,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
@@ -291,7 +291,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
@@ -486,7 +486,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
@@ -557,7 +557,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
@@ -702,7 +702,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'
@@ -747,7 +747,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'
diff --git a/releasenotes/notes/update-release-job-triggers-0346618a45d836eb.yaml b/releasenotes/notes/update-release-job-triggers-0346618a45d836eb.yaml
new file mode 100644
index 00000000..1125807d
--- /dev/null
+++ b/releasenotes/notes/update-release-job-triggers-0346618a45d836eb.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Verify and merge release jobs need to be trigger for only the branch in question.
+    Currently, all active branches verify jobs are triggering causing verify conflicts
+    when projects are releasing more than one branch simultaniously.