From def5ad7aad6c2ecf8f8df65d635f1a3567f75a8b Mon Sep 17 00:00:00 2001 From: BeyondPang Date: Tue, 31 Dec 2019 17:19:13 +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 67c8a7f20..5a911c8af 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 = 'dockerhub' + GITHUB_CREDENTIAL_ID = 'github' + KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'beyondpang' + GITHUB_ACCOUNT = 'beyondpang' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID= 'sonar-token' } From 8a600af08fe7c17184bc939e47e3e2398c9e4d2a Mon Sep 17 00:00:00 2001 From: BeyondPang Date: Thu, 2 Jan 2020 16:24:05 +0800 Subject: [PATCH 2/5] Update Jenkinsfile-online revert to original state --- Jenkinsfile-online | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 5a911c8af..67c8a7f20 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,12 +10,12 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'dockerhub' - GITHUB_CREDENTIAL_ID = 'github' - KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' + DOCKER_CREDENTIAL_ID = 'dockerhub-id' + GITHUB_CREDENTIAL_ID = 'github-id' + KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'beyondpang' - GITHUB_ACCOUNT = 'beyondpang' + DOCKERHUB_NAMESPACE = 'docker_username' + GITHUB_ACCOUNT = 'kubesphere' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID= 'sonar-token' } From f798fd8dabbc53a334b18021e29548ec45ef62f3 Mon Sep 17 00:00:00 2001 From: BeyondPang Date: Thu, 2 Jan 2020 16:44:25 +0800 Subject: [PATCH 3/5] changed to beyondpang. changed to beyondpang. --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 67c8a7f20..1c41b307f 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 = 'beyondpang' + GITHUB_ACCOUNT = 'beyondpang' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID= 'sonar-token' } From 418c88613746c6d1cd98601d494af519f3c8d38b Mon Sep 17 00:00:00 2001 From: BeyondPang Date: Tue, 21 Jan 2020 14:11:00 +0800 Subject: [PATCH 4/5] just txt change to check whether junit test works. --- src/main/java/io/kubesphere/devops/HelloWorldController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/kubesphere/devops/HelloWorldController.java b/src/main/java/io/kubesphere/devops/HelloWorldController.java index a6bdd4cde..55c2f6721 100644 --- a/src/main/java/io/kubesphere/devops/HelloWorldController.java +++ b/src/main/java/io/kubesphere/devops/HelloWorldController.java @@ -14,6 +14,6 @@ public class HelloWorldController { @RequestMapping("/") public String sayHello() { - return "Really appreaciate your star, that's the power of our life."; + return "DDC is great!"; } } From d5ab79036b5938aae4cad6eb90f41c59983bf329 Mon Sep 17 00:00:00 2001 From: BeyondPang Date: Tue, 21 Jan 2020 14:58:18 +0800 Subject: [PATCH 5/5] bug fixed. --- .../java/io/kubesphere/devops/HelloWorldControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java b/src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java index a83b15b54..67d604b4f 100644 --- a/src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java +++ b/src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java @@ -8,6 +8,6 @@ public class HelloWorldControllerTest { @Test public void testSayHello() { - assertEquals("Really appreaciate your star, that's the power of our life.", new HelloWorldController().sayHello()); + assertEquals("DDC is great!", new HelloWorldController().sayHello()); } }