kubesphere · tanjunjie · Oct 17, 2019 · Oct 17, 2019 · Oct 22, 2019 · Oct 25, 2019
diff --git a/.s2i/environment b/.s2i/environment
@@ -1,3 +1 @@
-S2I_DESTINATION=/tmp
-MAVEN_ARGS_APPEND=-Dmaven.repo.local=/tmp/src/artifacts/m2 -o
-DISABLE_ARTIFACTS=true
+S2I_DESTINATION=/tmp
diff --git a/Dockerfile-on-prem b/Dockerfile-on-prem
diff --git a/Jenkinsfile-on-prem b/Jenkinsfile-on-prem
diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -11,13 +11,10 @@ pipeline {
 
     environment {
         DOCKER_CREDENTIAL_ID = 'dockerhub-id'
-        GITHUB_CREDENTIAL_ID = 'github-id'
-        KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'tanjunjie'
+        GITHUB_ACCOUNT = 'tanjunjie'
         APP_NAME = 'devops-java-sample'
-        SONAR_CREDENTIAL_ID= 'sonar-token'
     }
 
     stages {
@@ -30,90 +27,32 @@ pipeline {
         stage ('unit test') {
             steps {
                 container ('maven') {
-                    sh 'mvn clean -o -gs `pwd`/configuration/settings.xml test'
+                    sh 'mvn clean test'
                 }
             }
         }
 
-        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') {
-                    sh 'mvn -o -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 .'
+                    sh 'mvn -Dmaven.test.skip=true clean package'
+                    archiveArtifacts 'target/*.jar'
+                    sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$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'
+                        sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER'
                     }
                 }
             }
         }
 
         stage('push latest'){
-           when{
-             branch 'master'
-           }
            steps{
                 container ('maven') {
-                  sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
-                  sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
+                  sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:cache '
+                  sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:cache '
                 }
            }
         }
-
-        stage('deploy to dev') {
-          when{
-            branch 'master'
-          }
-          steps {
-            input(id: 'deploy-to-dev', message: 'deploy to dev?')
-            kubernetesDeploy(configs: 'deploy/dev-ol/**', enableConfigSubstitution: true, kubeconfigId: "$KUBECONFIG_CREDENTIAL_ID")
-          }
-        }
-        stage('push with tag'){
-          when{
-            expression{
-              return params.TAG_NAME =~ /v.*/
-            }
-          }
-          steps {
-              container ('maven') {
-                input(id: 'release-image-with-tag', message: 'release image with tag?')
-                  withCredentials([usernamePassword(credentialsId: "$GITHUB_CREDENTIAL_ID", passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
-                    sh 'git config --global user.email "kubesphere@yunify.com" '
-                    sh 'git config --global user.name "kubesphere" '
-                    sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '
-                    sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4'
-                  }
-                sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
-                sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
-          }
-          }
-        }
-        stage('deploy to production') {
-          when{
-            expression{
-              return params.TAG_NAME =~ /v.*/
-            }
-          }
-          steps {
-            input(id: 'deploy-to-production', message: 'deploy to production?')
-            kubernetesDeploy(configs: 'deploy/prod-ol/**', enableConfigSubstitution: true, kubeconfigId: "$KUBECONFIG_CREDENTIAL_ID")
-          }
-        }
     }
 }
diff --git a/artifacts/m2/antlr/antlr/2.7.2/_remote.repositories b/artifacts/m2/antlr/antlr/2.7.2/_remote.repositories
diff --git a/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.jar b/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.jar
diff --git a/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 b/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1
diff --git a/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.pom b/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.pom
diff --git a/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 b/artifacts/m2/antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1
diff --git a/artifacts/m2/aopalliance/aopalliance/1.0/_remote.repositories b/artifacts/m2/aopalliance/aopalliance/1.0/_remote.repositories
diff --git a/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar b/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar
diff --git a/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar.sha1 b/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar.sha1
diff --git a/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom b/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
diff --git a/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.sha1 b/artifacts/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.sha1
diff --git a/artifacts/m2/asm/asm-analysis/3.2/_remote.repositories b/artifacts/m2/asm/asm-analysis/3.2/_remote.repositories
diff --git a/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.jar b/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.jar
diff --git a/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 b/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1
diff --git a/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.pom b/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.pom
diff --git a/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 b/artifacts/m2/asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1
diff --git a/artifacts/m2/asm/asm-commons/3.2/_remote.repositories b/artifacts/m2/asm/asm-commons/3.2/_remote.repositories
diff --git a/artifacts/m2/asm/asm-commons/3.2/asm-commons-3.2.pom b/artifacts/m2/asm/asm-commons/3.2/asm-commons-3.2.pom
diff --git a/artifacts/m2/asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 b/artifacts/m2/asm/asm-commons/3.2/asm-commons-3.2.pom.sha1
diff --git a/artifacts/m2/asm/asm-commons/3.3.1/_remote.repositories b/artifacts/m2/asm/asm-commons/3.3.1/_remote.repositories
diff --git a/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.jar b/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.jar
diff --git a/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 b/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1
diff --git a/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom b/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
diff --git a/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 b/artifacts/m2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1
diff --git a/artifacts/m2/asm/asm-parent/3.2/_remote.repositories b/artifacts/m2/asm/asm-parent/3.2/_remote.repositories