From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Thu, 29 Apr 2021 16:40:01 +0000 (-0700)
Subject: Fix: Correct choosing strategy use on merge
X-Git-Tag: v0.63.0^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=bee1d1152f7fd19e81ef23344011541d1d66a091;p=releng%2Fglobal-jjb.git

Fix: Correct choosing strategy use on merge

The choosing strategy being used by the docker-merge-{stream} jobs for
gerrit is set to gerrit and not default. Since this is a merge job it's
supposed to always pick up the tip / head of the repository.

Issue: RELENG-3657
Change-Id: I3b97bf01966aa85d8066ebea301d3205398e7e63
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml
index 0e1f1a1e..95bfa4b8 100644
--- a/jjb/lf-docker-jobs.yaml
+++ b/jjb/lf-docker-jobs.yaml
@@ -162,7 +162,7 @@
           submodule-disable: "{submodule-disable}"
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
-          choosing-strategy: gerrit
+          choosing-strategy: default
 
     gerrit_merge_triggers:
       - change-merged-event
diff --git a/releasenotes/notes/fix_choosing_strategy-46907863fefa76c3.yaml b/releasenotes/notes/fix_choosing_strategy-46907863fefa76c3.yaml
new file mode 100644
index 00000000..1ef7c625
--- /dev/null
+++ b/releasenotes/notes/fix_choosing_strategy-46907863fefa76c3.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The choosing strategy for the docker-merge-{stream} jobs for gerrit was
+    improperly configured to use. This is now corrected.