From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 11 Nov 2021 22:10:54 +0000 (-0800)
Subject: Fix: sonary-verify choosing strategy to "gerrit"
X-Git-Tag: v0.70.0^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F69105%2F2;p=releng%2Fglobal-jjb.git

Fix: sonary-verify choosing strategy to "gerrit"

Change-Id: Id5d1f3b2a832c2206788bb0a06a1173cb9018666
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index f4916176..04ae40fa 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -1385,7 +1385,7 @@
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: default
+          choosing-strategy: gerrit
 
 - job-template:
     name: "{project-name}-sonar-prescan-script"
diff --git a/releasenotes/notes/fix-sonar-verify-3fb0c21f91821f4f.yaml b/releasenotes/notes/fix-sonar-verify-3fb0c21f91821f4f.yaml
new file mode 100644
index 00000000..fec256af
--- /dev/null
+++ b/releasenotes/notes/fix-sonar-verify-3fb0c21f91821f4f.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    gerrit-maven-sonar-verify was using the "default" branch choosing strategy,
+    which pulls master, rather than the "gerrit" strategy for pulling feature
+    branches.