From 7786b5220771b3b32b87b6957495f828fc342291 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Fri, 19 Apr 2019 14:48:01 -0700 Subject: [PATCH] Fix gerrit-packer-merge choosing strategy Our definition of a merge job is that it always takes the HEAD of the branch. Gerrit Trigger choosing strategy does not do this and breaks expected outcomes when retriggering an old merge. Change-Id: I2e3c12f1c9b59e624e742943a5dbef5123129e6c Signed-off-by: Andrew Grimberg --- jjb/lf-ci-jobs.yaml | 2 +- releasenotes/notes/fix-packer-merge-b35289c55408f671.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-packer-merge-b35289c55408f671.yaml diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index bdebb0f5..881f7cea 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -1449,7 +1449,7 @@ branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' - choosing-strategy: gerrit + choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: diff --git a/releasenotes/notes/fix-packer-merge-b35289c55408f671.yaml b/releasenotes/notes/fix-packer-merge-b35289c55408f671.yaml new file mode 100644 index 00000000..efd2ebf3 --- /dev/null +++ b/releasenotes/notes/fix-packer-merge-b35289c55408f671.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + The packer-merge job for Gerrit systems was improperly configured to use the + Gerrit Trigger choosing strategy and not default. This caused issues + unexpected issues with retriggering merged changes when the expectation was + that it would pick up the lastest change as per normal. -- 2.16.6