Merge pull request kubesphere#1 from runzexia/runzexia-patch-1

soulseen · web-flow · commit 8beeafa1025f · 2019-04-11T16:08:52.000+08:00
Runzexia patch 1
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
         NAMESPACE = 'library'
         GITLAB_ACCOUNT = 'admin1'
         APP_NAME = 'devops-sample-s2i'
-        SONAR_TOKEN_ID= 'sonar-token'
+        SONAR_CREDENTIAL_ID= 'sonar-token'
     }
 
     stages {
@@ -38,8 +38,10 @@ pipeline {
         stage('sonarqube analysis') {
           steps {
             container ('maven') {
-              withSonarQubeEnv('sonar') {
-                sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN_ID"
+              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"
+                }
               }
               timeout(time: 1, unit: 'HOURS') {
                 waitForQualityGate abortPipeline: true
diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -17,7 +17,7 @@ pipeline {
         NAMESPACE = 'docker_username'
         GITHUB_ACCOUNT = 'kubesphere'
         APP_NAME = 'devops-sample-s2i'
-        SONAR_TOKEN_ID= 'sonar-token'
+        SONAR_CREDENTIAL_ID= 'sonar-token'
     }
 
     stages {
@@ -38,8 +38,10 @@ pipeline {
         stage('sonarqube analysis') {
           steps {
             container ('maven') {
-              withSonarQubeEnv('sonar') {
-                sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN_ID"
+              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"
+                }
               }
               timeout(time: 1, unit: 'HOURS') {
                 waitForQualityGate abortPipeline: true
diff --git a/src/main/java/io/kubesphere/devops/HelloWorldController.java b/src/main/java/io/kubesphere/devops/HelloWorldController.java
@@ -16,4 +16,4 @@ public class HelloWorldController {
     public String sayHello() {
         return "Hello,World!";
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ public class HelloWorldController {`
`16`	`16`	`public String sayHello() {`
`17`	`17`	`return "Hello,World!";`
`18`	`18`	`}`
`19`		`-}`
	`19`	`+}`