From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Tue, 28 Jan 2020 15:03:14 +0000 (-0500)
Subject: Release jobs use Gerrit Trigger choosing strategy
X-Git-Tag: v0.51.0~18
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=105796516adb521cd606f15737d43036eff389e3;p=releng%2Fglobal-jjb.git

Release jobs use Gerrit Trigger choosing strategy

Use choosing strategy Gerrit Trigger in container/jar and
package cloud release merge jobs. This retains the current
behavior in the simple merge case, and ensures that a job
triggered by a "remerge" comment uses the release file at
that commit.  The previous choosing strategy, default, uses
the tip of the target branch.  That does not allow recovery
from merge job failure if the target branch has advanced past
the commit with the release file.

Change-Id: I6685e54da9f1510243f52506794cf52a28b9eb61
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index f53a2d99..b95ffe8a 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -226,7 +226,7 @@
           submodule-disable: true
           submodule-recursive: false
           submodule-timeout: 10
-          choosing-strategy: default
+          choosing-strategy: gerrit
 
     triggers:
       - gerrit:
@@ -627,7 +627,7 @@
           submodule-disable: true
           submodule-recursive: false
           submodule-timeout: 10
-          choosing-strategy: default
+          choosing-strategy: gerrit
 
     triggers:
       - gerrit:
diff --git a/releasenotes/notes/release-merge-gerrit-choosing-strategy-8d9b631b8fec525a.yaml b/releasenotes/notes/release-merge-gerrit-choosing-strategy-8d9b631b8fec525a.yaml
new file mode 100644
index 00000000..af5a8233
--- /dev/null
+++ b/releasenotes/notes/release-merge-gerrit-choosing-strategy-8d9b631b8fec525a.yaml
@@ -0,0 +1,11 @@
+---
+fixes:
+  - |
+    Use choosing strategy Gerrit Trigger in container/jar and
+    package cloud release merge jobs. This retains the current
+    behavior in the simple merge case, and ensures that a job
+    triggered by a "remerge" comment uses the release file at
+    that commit.  The previous choosing strategy, default, uses
+    the tip of the target branch.  That does not allow recovery
+    from merge job failure if the target branch has advanced past
+    the commit with the release file.