From c1d68d793a5d5c89345e195c73e2a9461857fd93 Mon Sep 17 00:00:00 2001
From: DXone1 <31177004+DXone1@users.noreply.github.com>
Date: Sat, 11 Dec 2021 15:43:14 +0800
Subject: [PATCH 1/4] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 2ca69e7f..04568a0f 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -14,9 +14,10 @@ pipeline {
         GITHUB_CREDENTIAL_ID = 'github-id'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'dxone1'
+        GITHUB_ACCOUNT = 'DXone1'
         APP_NAME = 'devops-java-sample'
+        SONAR_CREDENTIAL_ID = 'sonar-qube'
     }
 
     stages {

From 379a52382e0cd2796429ba9baa1e5fc335b1a6c2 Mon Sep 17 00:00:00 2001
From: DXone1 <31177004+DXone1@users.noreply.github.com>
Date: Sat, 11 Dec 2021 15:43:28 +0800
Subject: [PATCH 2/4] Create Jenkinsfile-online


From 0fa8dd0ccd89ba671c1aebb1ecac812944ee9c64 Mon Sep 17 00:00:00 2001
From: DXone1 <31177004+DXone1@users.noreply.github.com>
Date: Sat, 11 Dec 2021 15:55:42 +0800
Subject: [PATCH 3/4] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 04568a0f..5ddda9a7 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -30,7 +30,7 @@ pipeline {
         stage ('unit test') {
             steps {
                 container ('maven') {
-                    sh 'mvn clean  -gs `pwd`/configuration/settings.xml test'
+                    sh 'mvn clean -gs `pwd`/configuration/settings.xml test'
                 }
             }
         }
@@ -47,7 +47,22 @@ pipeline {
                 }
             }
         }
-
+        
+        stage('sonarqube analysis') {
+          steps {
+            container ('maven') {
+              withCredentials([string(credentialsId: "$SONAR_CREDENTIAL_ID", variable: 'SONAR_TOKEN')]) {
+                withSonarQubeEnv('sonar') {
+                 sh "mvn sonar:sonar -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN"
+                }
+              }
+              timeout(time: 1, unit: 'HOURS') {
+                waitForQualityGate abortPipeline: true
+              }
+            }
+          }
+        }
+    
         stage('push latest'){
            when{
              branch 'master'

From 2538efa2cc5ca040860a20ddbcf3f74f51c4aaad Mon Sep 17 00:00:00 2001
From: DXone1 <31177004+DXone1@users.noreply.github.com>
Date: Sat, 11 Dec 2021 15:57:12 +0800
Subject: [PATCH 4/4] Update Jenkinsfile-online

---
 Jenkinsfile-online | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 5ddda9a7..14d670ba 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -34,19 +34,6 @@ pipeline {
                 }
             }
         }
- 
-        stage ('build & push') {
-            steps {
-                container ('maven') {
-                    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'
-                        sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
-                    }
-                }
-            }
-        }
         
         stage('sonarqube analysis') {
           steps {
@@ -62,6 +49,19 @@ pipeline {
             }
           }
         }
+ 
+        stage ('build & push') {
+            steps {
+                container ('maven') {
+                    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'
+                        sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
+                    }
+                }
+            }
+        }        
     
         stage('push latest'){
            when{