From 5fff234d89f505827f10408685fda63078dcd199 Mon Sep 17 00:00:00 2001 From: waydeng <32809142+waydeng@users.noreply.github.com> Date: Sat, 9 Oct 2021 18:19:34 +0800 Subject: [PATCH 1/5] Update Jenkinsfile-online --- Jenkinsfile-online | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2ca69e7f..711001d3 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,12 +10,12 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'dockerhub-id' - GITHUB_CREDENTIAL_ID = 'github-id' - KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' + DOCKER_CREDENTIAL_ID = 'waydeng' + GITHUB_CREDENTIAL_ID = 'waydeng' + KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'waydeng' + GITHUB_ACCOUNT = 'waydeng' APP_NAME = 'devops-java-sample' } From c3da9fe5f08b2e0aabb063d945c4eb08ead07ea2 Mon Sep 17 00:00:00 2001 From: waydeng <32809142+waydeng@users.noreply.github.com> Date: Sat, 9 Oct 2021 18:24:28 +0800 Subject: [PATCH 2/5] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 711001d3..b7e299b7 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,8 +10,8 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'waydeng' - GITHUB_CREDENTIAL_ID = 'waydeng' + DOCKER_CREDENTIAL_ID = 'github-id' + GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' REGISTRY = 'docker.io' DOCKERHUB_NAMESPACE = 'waydeng' From a43b16297f0a059e58f141eb2a9328039a35b313 Mon Sep 17 00:00:00 2001 From: waydeng <32809142+waydeng@users.noreply.github.com> Date: Mon, 11 Oct 2021 17:06:47 +0800 Subject: [PATCH 3/5] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index b7e299b7..055b04b8 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -15,7 +15,7 @@ pipeline { KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' REGISTRY = 'docker.io' DOCKERHUB_NAMESPACE = 'waydeng' - GITHUB_ACCOUNT = 'waydeng' + GITHUB_ACCOUNT = 'github-id' APP_NAME = 'devops-java-sample' } From 58e35ee6a37cd663e2cc7243ab088cb0b9c6b163 Mon Sep 17 00:00:00 2001 From: waydeng <32809142+waydeng@users.noreply.github.com> Date: Mon, 11 Oct 2021 18:11:41 +0800 Subject: [PATCH 4/5] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 055b04b8..31cf986c 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,12 +10,12 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'github-id' + DOCKER_CREDENTIAL_ID = 'dockerhub-id' GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' REGISTRY = 'docker.io' DOCKERHUB_NAMESPACE = 'waydeng' - GITHUB_ACCOUNT = 'github-id' + GITHUB_ACCOUNT = 'waydeng' APP_NAME = 'devops-java-sample' } From 0365726e49b12bf8f291eb04cb7885855027e98a Mon Sep 17 00:00:00 2001 From: waydeng <32809142+waydeng@users.noreply.github.com> Date: Tue, 12 Oct 2021 10:38:41 +0800 Subject: [PATCH 5/5] Update Jenkinsfile-online --- Jenkinsfile-online | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 31cf986c..8964482a 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -17,6 +17,7 @@ pipeline { DOCKERHUB_NAMESPACE = 'waydeng' GITHUB_ACCOUNT = 'waydeng' APP_NAME = 'devops-java-sample' + SONAR_CREDENTIAL_ID = 'java-token' } stages {