From 7177ce9f9291a1cf2fa99fe6ff75e279ed4465ef Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 23 Jul 2020 15:27:17 -0400 Subject: [PATCH] Explicity set Gerrit comment mode to PLAIN The default setting for this config is BASE64 where it used to be PLAIN. Explicity set what we expect the mode to be so that the job does not fail to parse an unexpected base64 string. Change-Id: Icf8ae74089f6f60cc03f41d4526d038c78e65606 Signed-off-by: Thanh Ha --- jjb/lf-ci-jobs.yaml | 2 ++ jjb/lf-maven-jobs.yaml | 1 + .../notes/jjb-35-gerrit-trigger-0c0e1421c7b4b3be.yaml | 13 +++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/jjb-35-gerrit-trigger-0c0e1421c7b4b3be.yaml diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index a48f3251..fd463299 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -227,6 +227,7 @@ branches: - branch-compare-type: ANT branch-pattern: "**/{branch}" + comment-text-parameter-mode: PLAIN builders: - shell: !include-raw-escape: ../shell/gerrit-branch-lock.sh @@ -672,6 +673,7 @@ failed: true unstable: true notbuilt: true + comment-text-parameter-mode: PLAIN - job-template: name: "{project-name}-jjb-deploy-job" diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 77f34de6..d13bb5d3 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -1663,3 +1663,4 @@ - branch-compare-type: ANT branch-pattern: "**/{branch}" file-paths: "{obj:gerrit_trigger_file_paths}" + comment-text-parameter-mode: PLAIN diff --git a/releasenotes/notes/jjb-35-gerrit-trigger-0c0e1421c7b4b3be.yaml b/releasenotes/notes/jjb-35-gerrit-trigger-0c0e1421c7b4b3be.yaml new file mode 100644 index 00000000..0b50379b --- /dev/null +++ b/releasenotes/notes/jjb-35-gerrit-trigger-0c0e1421c7b4b3be.yaml @@ -0,0 +1,13 @@ +--- +fixes: + - | + Retains the expected behaviour of Gerrit Trigger job configuration + for the comment-event-parameter-mode when a project upgrades their + JJB to 3.5.0 or newer. + + In JJB 3.5.0 support was added to configure the + comment-event-parameter-mode however, while it's default mode in JJB + matches the documented help text for the configuration in Jenkins the + Gerrit Trigger plugin itself appears to default to PLAIN mode when + the parameter is excluded. This patch retains what we expect to be the + default behaviour. -- 2.16.6