From a45923e3beef469ab6c06213e90d5a8a729ad062 Mon Sep 17 00:00:00 2001 From: eagle2016 Date: Thu, 23 May 2019 16:45:02 +0800 Subject: [PATCH 1/3] Update Jenkinsfile-online --- Jenkinsfile-online | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index ea795c9d..9140cd79 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,10 +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 = 'baozhenl' + GITHUB_ACCOUNT = 'eagle2016' APP_NAME = 'devops-java-sample' - SONAR_CREDENTIAL_ID= 'sonar-token' + SONAR_CREDENTIAL_ID= 'devops-demo' } stages { From f616bed91dbb8c445def32281f79a9f84d74a7cb Mon Sep 17 00:00:00 2001 From: eagle2016 Date: Fri, 24 May 2019 10:49:40 +0800 Subject: [PATCH 2/3] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 9140cd79..7d9bd70f 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -97,7 +97,7 @@ pipeline { 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' + sh 'git push -4 http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags' } 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 ' From 6f8df01670fa7b5dfc9a79a557a30a4f925e7d61 Mon Sep 17 00:00:00 2001 From: eagle2016 Date: Fri, 24 May 2019 14:14:01 +0800 Subject: [PATCH 3/3] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 7d9bd70f..8a5889f3 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -97,7 +97,7 @@ pipeline { 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 -4 http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags' + sh 'git push -4 https://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags' } 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 '