update cmd sonar

soulseen · soulseen · commit 7c3fd2d76acb · 2019-04-04T11:53:30.000+08:00
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>

Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,15 @@ pipeline {`
`36`	`36`
`37`	`37`	`stage('sonarqube analysis') {`
`38`	`38`	`steps {`
`39`		`- withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {`
`40`		`- withSonarQubeEnv('sonar') {`
`41`		- sh "mvn -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.sources=. -Dsonar.login=$SONAR_TOKEN"
	`39`	`+ container ('maven') {`
	`40`	`+ withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {`
	`41`	`+ withSonarQubeEnv('sonar') {`
	`42`	+ sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.sources=. -Dsonar.login=$SONAR_TOKEN"
	`43`	`+ }`
	`44`	`+ }`
	`45`	`+ timeout(time: 1, unit: 'HOURS') {`
	`46`	`+ waitForQualityGate abortPipeline: true`
`42`	`47`	`}`
`43`		`- }`
`44`		`- timeout(time: 1, unit: 'HOURS') {`
`45`		`- waitForQualityGate abortPipeline: true`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`	`}`