From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Fri, 19 Apr 2019 21:48:01 +0000 (-0700)
Subject: Fix gerrit-packer-merge choosing strategy
X-Git-Tag: v0.37.0~9
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F15354%2F1;hp=bc5892ef503dc4039aa0aae4043e5c9b2cc9a363;p=releng%2Fglobal-jjb.git

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 <agrimberg@linuxfoundation.org>
---

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.