From 410cbe0d834651046cd5fa1dc70642c945fe5f84 Mon Sep 17 00:00:00 2001 From: Jacob Date: Sun, 2 Aug 2020 14:27:09 +0800 Subject: [PATCH 1/4] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index dec0cebf..23878d33 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 = 'jacob1107' + GITHUB_ACCOUNT = 'jacob1107@163.com' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' } From e8d696b94f28a5aaf362575ec579c2d5a5a45432 Mon Sep 17 00:00:00 2001 From: Jacob Date: Sun, 9 Aug 2020 08:43:06 +0800 Subject: [PATCH 2/4] Update Jenkinsfile-on-prem --- Jenkinsfile-on-prem | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile-on-prem b/Jenkinsfile-on-prem index 1a47ed52..1d10a500 100644 --- a/Jenkinsfile-on-prem +++ b/Jenkinsfile-on-prem @@ -9,15 +9,17 @@ pipeline { string(name:'TAG_NAME',defaultValue: '',description:'') } + environment { - HARBOR_CREDENTIAL_ID = 'harbor-id' - GITLAB_CREDENTIAL_ID = 'gitlab-id' + DOCKER_CREDENTIAL_ID = 'dockerhub-id' + GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' - REGISTRY = 'harbor.devops.kubesphere.local:30280' - HARBOR_NAMESPACE = 'library' - GITLAB_ACCOUNT = 'admin1' + REGISTRY = 'docker.io' + DOCKERHUB_NAMESPACE = 'jacob1107' + GITHUB_ACCOUNT = 'jacob1107@163.com' APP_NAME = 'devops-java-sample' - SONAR_CREDENTIAL_ID= 'sonar-token' + SONAR_CREDENTIAL_ID = 'sonar-token' + } stages { From 2e41cd26d6d6775276e057adce97325ee4054512 Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 12 Feb 2021 10:07:52 +0800 Subject: [PATCH 3/4] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 23878d33..23fb3976 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -17,7 +17,7 @@ pipeline { DOCKERHUB_NAMESPACE = 'jacob1107' GITHUB_ACCOUNT = 'jacob1107@163.com' APP_NAME = 'devops-java-sample' - SONAR_CREDENTIAL_ID = 'sonar-token' + SONAR_CREDENTIAL_ID = 'k8s' } stages { From 06b9ffc959e50ab4f557d8c21d51b94d37807cfb Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 12 Feb 2021 10:12:33 +0800 Subject: [PATCH 4/4] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 23fb3976..23878d33 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -17,7 +17,7 @@ pipeline { DOCKERHUB_NAMESPACE = 'jacob1107' GITHUB_ACCOUNT = 'jacob1107@163.com' APP_NAME = 'devops-java-sample' - SONAR_CREDENTIAL_ID = 'k8s' + SONAR_CREDENTIAL_ID = 'sonar-token' } stages {