Merge "Upgrade packer version to 1.4.0"

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 73ab2b0..5019cb9 100644 (file)
--- 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 (file)
index 0000000..efd2ebf
--- /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.