X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=.github%2Fworkflows%2Fgerrit-merge.yaml;h=db5b62f27aeb04d3183e852a5bb98ff777252e35;hb=refs%2Fheads%2Fmaster;hp=d9be6303c4177e45c79ec50a0e1d134293d8091f;hpb=5c20b6eabc8e6204f32a5dc7fbee4addfc6fb971;p=ccsdk%2Fcds.git

diff --git a/.github/workflows/gerrit-merge.yaml b/.github/workflows/gerrit-merge.yaml
index d9be6303c..db5b62f27 100644
--- a/.github/workflows/gerrit-merge.yaml
+++ b/.github/workflows/gerrit-merge.yaml
@@ -67,7 +67,7 @@ jobs:
         run: sleep 10s
 
   run-maven-clm:
-    needs: prepare
+    needs: notify
     # yamllint disable-line rule:line-length
     uses: lfit/releng-reusable-workflows/.github/workflows/composed-maven-nexus-iq.yaml@main
     with:
@@ -81,18 +81,48 @@ jobs:
       GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }}
       GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
       # yamllint disable rule:line-length
-      mvn-phases: "clean install dependency:tree com.sonatype.clm:clm-maven-plugin:2.41.0-02:index"
-      mvn-opts: >-
-      -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-      -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-      -DaltDeploymentRepository=staging::default::file:"${GITHUB_WORKSPACE}"/m2repo
-      --add-opens=java.base/java.util=ALL-UNNAMED
+      ENV_VARS: '{"MAVEN_OPTS": "--add-opens=java.base/java.util=ALL-UNNAMED"}'
+      ENV_SECRETS: "{}"
+      JDK_VERSION: "17"
+      MVN_PHASES: "clean install dependency:tree com.sonatype.clm:clm-maven-plugin:2.41.0-02:index"
+      MVN_OPTS: >-
+        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+        -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+        -DaltDeploymentRepository=staging::default::file:"${GITHUB_WORKSPACE}"/m2repo
     secrets:
       NEXUS_IQ_PASSWORD: ${{ secrets.NEXUS_IQ_PASSWORD }}
 
+  run-maven-sonar:
+    needs: notify
+    # yamllint disable-line rule:line-length
+    uses: lfit/releng-reusable-workflows/.github/workflows/composed-maven-sonar-cloud.yaml@main
+    with:
+      GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
+      GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
+      GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+      GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }}
+      GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }}
+      GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+      GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }}
+      GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }}
+      GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
+      # yamllint disable rule:line-length
+      ENV_VARS: '{"MAVEN_OPTS": "--add-opens=java.base/java.util=ALL-UNNAMED"}'
+      ENV_SECRETS: "{}"
+      JDK_VERSION: "17"
+      SONAR_PROJECT_KEY: "onap_ccsdk-cds"
+      SONAR_ORG: "onap"
+      SONAR_ARGS: >
+        -Dsonar.sources=src/main
+        -Dsonar.test.inclusions=**/*.java,**/*.kt
+        -Dsonar.tests=src/test
+        -Dsonar.verbose=true
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
   report-status:
     if: ${{ always() }}
-    needs: [notify, run-maven-clm]
+    needs: [notify, run-maven-clm, run-maven-sonar]
     runs-on: ubuntu-latest
     steps:
       - name: Get workflow conclusion