From 186e0a7f0b4bf5e6a8ae67274528f7635940536d Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 9 Nov 2023 09:36:15 -0800 Subject: [PATCH] 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 Change-Id: Ifff3470671df4b6d05d78575d809c1befa7056de --- jjb/lf-release-jobs.yaml | 12 ++++++------ .../notes/update-release-job-triggers-0346618a45d836eb.yaml | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/update-release-job-triggers-0346618a45d836eb.yaml 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. -- 2.16.6