From 56b2caaeae73eba99665e65330f5ec8f7ad5fc0b Mon Sep 17 00:00:00 2001
From: riyuezhixing <hunter.pu8@gmail.com>
Date: Wed, 20 May 2020 22:25:14 +0800
Subject: [PATCH 1/2] Update Jenkinsfile-online

---
 Jenkinsfile-online | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index dec0cebff..d64a91e98 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -14,8 +14,8 @@ pipeline {
         GITHUB_CREDENTIAL_ID = 'github-id'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'bestming8'
+        GITHUB_ACCOUNT = 'riyuezhixing'
         APP_NAME = 'devops-java-sample'
         SONAR_CREDENTIAL_ID = 'sonar-token'
     }
@@ -35,21 +35,6 @@ pipeline {
             }
         }
 
-        stage('sonarqube analysis') {
-          steps {
-            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"
-                }
-              }
-              timeout(time: 1, unit: 'HOURS') {
-                waitForQualityGate abortPipeline: true
-              }
-            }
-          }
-        }
-
         stage ('build & push') {
             steps {
                 container ('maven') {

From 7fac6c1bb23aee6996364136702fa22b9545ec43 Mon Sep 17 00:00:00 2001
From: riyuezhixing <hunter.pu8@gmail.com>
Date: Wed, 20 May 2020 22:27:05 +0800
Subject: [PATCH 2/2] Update Jenkinsfile-online

---
 Jenkinsfile-online | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index d64a91e98..19d0f6d93 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -30,7 +30,7 @@ pipeline {
         stage ('unit test') {
             steps {
                 container ('maven') {
-                    sh 'mvn clean -o -gs `pwd`/configuration/settings.xml test'
+                    sh 'mvn clean -gs `pwd`/configuration/settings.xml test'
                 }
             }
         }
@@ -38,7 +38,7 @@ pipeline {
         stage ('build & push') {
             steps {
                 container ('maven') {
-                    sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
+                    sh 'mvn -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
                     sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
                     withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$DOCKER_CREDENTIAL_ID" ,)]) {
                         sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin'