Merge pull request #289 from entur/sonar-in-cci

Move sonar scanning back to circleci

.circleci/config.yml

@@ -14,7 +14,20 @@ aliases:
       echo 'export CIRCLE_SHA1="$CIRCLE_SHA1"' >> $BASH_ENV
       echo 'export CIRCLE_PROJECT_REPONAME="$CIRCLE_PROJECT_REPONAME"' >> $BASH_ENV
        .circleci/trigger_build_v2.sh "entur/lamassu-deployment-config.git" "master" "$(git log -1 --pretty=%B)"
-
+  - &sonar-scan
+    name: Sonar scan
+    command: |
+      mvn -s .circleci/settings.xml \
+        org.jacoco:jacoco-maven-plugin:prepare-agent verify \
+        org.jacoco:jacoco-maven-plugin:report sonar:sonar \
+        -P prettierSkip \
+        -Dmaven.main.skip \
+        -DskipTests \
+        -Dsonar.projectKey=entur_${CIRCLE_PROJECT_REPONAME} \
+        -Dsonar.organization=${SONAR_ORG} \
+        -Dsonar.projectName=${CIRCLE_PROJECT_REPONAME} \
+        -Dsonar.host.url=https://sonarcloud.io \
+        -Dsonar.login=${ENTUR_SONAR_PASSWORD}
 jobs:
   test:
     docker:

.github/workflows/ci.yml

@@ -36,17 +36,6 @@ jobs:
           mvn --batch-mode jacoco:prepare-agent test jacoco:report -Dprettier.nodePath=node -Dprettier.npmPath=npm
           mvn --batch-mode jib:dockerBuild -Dmaven.test.skip -P prettierSkip
 
-      - name: SonarQube Scan
-        run: |
-          mvn \
-          org.jacoco:jacoco-maven-plugin:prepare-agent verify \
-          org.jacoco:jacoco-maven-plugin:report sonar:sonar \
-          -Dmaven.main.skip \
-          -DskipTests \
-          -Dsonar.projectKey=entur_lamassu \
-          -Dsonar.organization=enturas-github \
-          -Dsonar.host.url=https://sonarcloud.io \
-          -Dsonar.login=${{ secrets.ENTUR_SONAR_PASSWORD }}
 
   image:
     # only build and push the image when it's a commit to master in Entur's repository