update cmd sonar

evendou · Apr 4, 2019 · a36c3a2 · a36c3a2
1 parent 70f1f98
commit a36c3a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -36,13 +36,15 @@ pipeline {
 
         stage('sonarqube analysis') {
           steps {
-            withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
-              withSonarQubeEnv('sonar') {
-                sh "mvn -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.sources=.  -Dsonar.login=$SONAR_TOKEN"
+            container ('maven') {
+              withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
+                withSonarQubeEnv('sonar') {
+                  sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.sources=.  -Dsonar.login=$SONAR_TOKEN"
+                }
+              }
+              timeout(time: 1, unit: 'HOURS') {
+                waitForQualityGate abortPipeline: true
               }
-            }
-            timeout(time: 1, unit: 'HOURS') {
-              waitForQualityGate abortPipeline: true
             }
           }
         }

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -36,14 +36,16 @@ pipeline {
 
         stage('sonarqube analysis') {
           steps {
-            withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
-              withSonarQubeEnv('sonar') {
-                sh "mvn -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.sources=.  -Dsonar.login=$SONAR_TOKEN"
+            container ('maven') {
+              withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
+                withSonarQubeEnv('sonar') {
+                  sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.sources=.  -Dsonar.login=$SONAR_TOKEN"
+                }
               }
-            }
-            timeout(time: 1, unit: 'HOURS') {
-              waitForQualityGate abortPipeline: true
-            }
+              timeout(time: 1, unit: 'HOURS') {
+                waitForQualityGate abortPipeline: true
+              }
+          }
           }
         }
 

diff --git a/configuration/settings.xml b/configuration/settings.xml
@@ -30,7 +30,7 @@
       <id>sonar</id>
       <activation>
           <activeByDefault>true</activeByDefault>
-      </activation>        
+      </activation>    
     </profile>
   </profiles>
   <mirrors>