Merge pull request kubesphere#45 from shaowenchen/sonarqube

shaowenchen · web-flow · commit ea836773f1f3 · 2020-10-29T10:01:12.000+08:00
fix: remove unsupported parameters
diff --git a/Jenkinsfile-on-prem b/Jenkinsfile-on-prem
@@ -40,7 +40,7 @@ pipeline {
             container ('maven') {
               withCredentials([string(credentialsId: "$SONAR_CREDENTIAL_ID", variable: 'SONAR_TOKEN')]) {
                 withSonarQubeEnv('sonar') {
-                 sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN"
+                 sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.login=$SONAR_TOKEN"
                 }
               }
               timeout(time: 1, unit: 'HOURS') {
diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -40,7 +40,7 @@ pipeline {
             container ('maven') {
               withCredentials([string(credentialsId: "$SONAR_CREDENTIAL_ID", variable: 'SONAR_TOKEN')]) {
                 withSonarQubeEnv('sonar') {
-                 sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN"
+                 sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.login=$SONAR_TOKEN"
                 }
               }
               timeout(time: 1, unit: 'HOURS') {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pipeline {`
`40`	`40`	`container ('maven') {`
`41`	`41`	`withCredentials([string(credentialsId: "$SONAR_CREDENTIAL_ID", variable: 'SONAR_TOKEN')]) {`
`42`	`42`	`withSonarQubeEnv('sonar') {`
`43`		- sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN"
	`43`	+ sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.login=$SONAR_TOKEN"
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`timeout(time: 1, unit: 'HOURS') {`