From 173145cb5fbef5a9ac72188b0621ff14cea276d7 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Mon, 19 Aug 2019 15:07:54 -0400 Subject: [PATCH] Hard code release job compare pattern. This change: https://gerrit.acumos.org/r/c/ci-management/+/4979 The project section has: gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: '^((?!migrate-cms-to-cds|\/COMMIT_MSG).)*$' This is overwriting the default parameters of this job. gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: "releases/*.yaml" I belive I should hard code this value so that this does not happen. Pattern going forward will actually support pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)' I will update 16470 and hard code as well, if this is merged. ISSUE: RELENG-2316 Signed-off-by: Aric Gardner Change-Id: Ib520672a548f34762c723972152abea898cd98a8 --- jjb/lf-release-jobs.yaml | 16 ++++++---------- releasenotes/notes/lf-release-jobs-843a574d66df6263.yaml | 7 +++++++ 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/lf-release-jobs-843a574d66df6263.yaml diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml index 328c65aa..657c7014 100644 --- a/jjb/lf-release-jobs.yaml +++ b/jjb/lf-release-jobs.yaml @@ -14,14 +14,6 @@ - lf_release_common: &lf_release_common name: lf-release-common - ###################### - # Default parameters # - ###################### - - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: "releases/*.yaml" - ##################### # Job Configuration # ##################### @@ -123,7 +115,9 @@ branches: - branch-compare-type: "ANT" branch-pattern: "**" - file-paths: "{obj:gerrit_trigger_file_paths}" + file-paths: + - compare-type: ANT + pattern: "releases/*.yaml" skip-vote: successful: "{gerrit-skip-vote}" failed: "{gerrit-skip-vote}" @@ -206,4 +200,6 @@ branches: - branch-compare-type: "ANT" branch-pattern: "**" - file-paths: "{obj:gerrit_trigger_file_paths}" + file-paths: + - compare-type: ANT + pattern: "releases/*.yaml" diff --git a/releasenotes/notes/lf-release-jobs-843a574d66df6263.yaml b/releasenotes/notes/lf-release-jobs-843a574d66df6263.yaml new file mode 100644 index 00000000..383c7d73 --- /dev/null +++ b/releasenotes/notes/lf-release-jobs-843a574d66df6263.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Project job sections that define gerrit_trigger_file_paths + are overriding ones set in Default parameters of + lf_release_common + Hard Code gerrit_trigger_file_paths to fix this. -- 2.16.6