modify ns & package off

soulseen · soulseen · commit 9095fc40af5d · 2019-04-10T16:29:33.000+08:00
diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -30,7 +30,7 @@ pipeline {
         stage ('unit test') {
             steps {
                 container ('maven') {
-                    sh 'mvn test'
+                    sh 'mvn clean -o -gs `pwd`/configuration/settings.xml test'
                 }
             }
         }
@@ -51,7 +51,7 @@ pipeline {
         stage ('build & push') {
             steps {
                 container ('maven') {
-                    sh 'mvn -Dmaven.test.skip=true clean package'
+                    sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
                     sh 'docker build -f Dockerfile-online -t $REDISTRY/$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 $REDISTRY -u "$DOCKER_USERNAME" --password-stdin'
diff --git a/deploy/dev/devops-sample-svc.yaml b/deploy/dev/devops-sample-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: kubesphere
     component: ks-sample-dev
   name: ks-sample-dev
-  namespace: kubesphere-dev
+  namespace: kubesphere-sample-dev
 spec:
   ports:
     - name: http
diff --git a/deploy/dev/devops-sample.yaml b/deploy/dev/devops-sample.yaml
@@ -6,7 +6,7 @@ metadata:
     component: ks-sample-dev
     tier: backend
   name: ks-sample-dev
-  namespace: kubesphere-dev
+  namespace: kubesphere-sample-dev
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
diff --git a/deploy/prod/devops-sample-svc.yaml b/deploy/prod/devops-sample-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: kubesphere
     component: ks-sample
   name: ks-sample
-  namespace: kubesphere-prod
+  namespace: kubesphere-sample-prod
 spec:
   ports:
     - name: http
diff --git a/deploy/prod/devops-sample.yaml b/deploy/prod/devops-sample.yaml
@@ -6,7 +6,7 @@ metadata:
     component: ks-sample
     tier: backend
   name: ks-sample
-  namespace: kubesphere-prod
+  namespace: kubesphere-sample-prod
 spec:
   progressDeadlineSeconds: 600
   replicas: 2

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ pipeline {`
`30`	`30`	`stage ('unit test') {`
`31`	`31`	`steps {`
`32`	`32`	`container ('maven') {`
`33`		`- sh 'mvn test'`
	`33`	+ sh 'mvn clean -o -gs `pwd`/configuration/settings.xml test'
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
`@@ -51,7 +51,7 @@ pipeline {`
`51`	`51`	`stage ('build & push') {`
`52`	`52`	`steps {`
`53`	`53`	`container ('maven') {`
`54`		`- sh 'mvn -Dmaven.test.skip=true clean package'`
	`54`	+ sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
`55`	`55`	`sh 'docker build -f Dockerfile-online -t $REDISTRY/$NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'`
`56`	`56`	`withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$DOCKER_CREDENTIAL_ID" ,)]) {`
`57`	`57`	`sh 'echo "$DOCKER_PASSWORD" \| docker login $REDISTRY -u "$DOCKER_USERNAME" --password-stdin'`