Merge "Chore: Update pre-commit dependencies"

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index f491617..04ae40f 100644 (file)
--- 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-shell-script-maven-sonar-ed2dfaafcc10bbbb.yaml b/releasenotes/notes/fix-shell-script-maven-sonar-ed2dfaafcc10bbbb.yaml
new file mode 100644 (file)
index 0000000..ce0ee67
--- /dev/null
+++ b/releasenotes/notes/fix-shell-script-maven-sonar-ed2dfaafcc10bbbb.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix shell script maven-sonar.sh to handle parameter $SCAN_DEV_BRANCH
+    as string and not as boolean, so we can achieve the desired IF logic

diff --git a/releasenotes/notes/fix-sonar-verify-3fb0c21f91821f4f.yaml b/releasenotes/notes/fix-sonar-verify-3fb0c21f91821f4f.yaml
new file mode 100644 (file)
index 0000000..fec256a
--- /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.

diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh
index 9af6e42..5b460c5 100644 (file)
--- a/shell/maven-sonar.sh
+++ b/shell/maven-sonar.sh
@@ -34,7 +34,7 @@ if [ "$SONAR_HOST_URL" = "https://sonarcloud.io" ]; then
     params+=("-Dsonar.projectKey=$PROJECT_KEY")
     params+=("-Dsonar.organization=$PROJECT_ORGANIZATION")
     params+=("-Dsonar.login=$API_TOKEN")
-    if $SCAN_DEV_BRANCH; then
+    if [ "$SCAN_DEV_BRANCH" = "True" ]; then
         echo "Will scan short lived branch ..."
         # shellcheck disable=SC2236
         if [ ! -z ${GERRIT_CHANGE_NUMBER+x} ]; then