From f414d32a53c675221900c1ce786986b8e33d53d2 Mon Sep 17 00:00:00 2001 From: cuiyuliang Date: Mon, 3 Aug 2020 10:55:28 +0800 Subject: [PATCH 1/4] Update Jenkinsfile-online --- Jenkinsfile-online | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index dec0cebff..2e458cee4 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' - REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKER_CREDENTIAL_ID = 'docker' + GITHUB_CREDENTIAL_ID = 'github' + KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' + REGISTRY = 'registry.cn-hangzhou.aliyuncs.com' + DOCKERHUB_NAMESPACE = 'cuiyuliang926@163.com' + GITHUB_ACCOUNT = 'cuiyuliang926@163.com' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' } From 7b6ef4e047239f521c563e3c22dbb8c8a7929188 Mon Sep 17 00:00:00 2001 From: cuiyuliang Date: Mon, 3 Aug 2020 11:55:24 +0800 Subject: [PATCH 2/4] Update Jenkinsfile-online 1111 --- Jenkinsfile-online | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2e458cee4..baa7cfd68 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,9 +10,9 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'docker' - GITHUB_CREDENTIAL_ID = 'github' - KUBECONFIG_CREDENTIAL_ID = 'kubeconfig' + DOCKER_CREDENTIAL_ID = 'ali-docker-id' + GITHUB_CREDENTIAL_ID = 'github-id' + KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'registry.cn-hangzhou.aliyuncs.com' DOCKERHUB_NAMESPACE = 'cuiyuliang926@163.com' GITHUB_ACCOUNT = 'cuiyuliang926@163.com' From 9269eb0fde15cd4d63c83979bcf266bff7a64db9 Mon Sep 17 00:00:00 2001 From: cuiyuliang Date: Mon, 3 Aug 2020 13:26:23 +0800 Subject: [PATCH 3/4] Delete HelloWorldControllerTest.java --- .../kubesphere/devops/HelloWorldControllerTest.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java diff --git a/src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java b/src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java deleted file mode 100644 index b342eabf7..000000000 --- a/src/test/java/io/kubesphere/devops/HelloWorldControllerTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.kubesphere.devops; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class HelloWorldControllerTest { - - @Test - public void testSayHello() { - assertEquals("Really appreciate your star, that's the power of our life.", new HelloWorldController().sayHello()); - } -} From 2d22888c3ff388cc80cc7fd5856ffc4f9525d01e Mon Sep 17 00:00:00 2001 From: cuiyuliang Date: Wed, 5 Aug 2020 10:45:58 +0800 Subject: [PATCH 4/4] Update Jenkinsfile-online --- Jenkinsfile-online | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index baa7cfd68..0b3f53b98 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,12 +10,12 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'ali-docker-id' - GITHUB_CREDENTIAL_ID = 'github-id' + DOCKER_CREDENTIAL_ID = 'docker-id' + GITHUB_CREDENTIAL_ID = 'git-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'registry.cn-hangzhou.aliyuncs.com' DOCKERHUB_NAMESPACE = 'cuiyuliang926@163.com' - GITHUB_ACCOUNT = 'cuiyuliang926@163.com' + GITHUB_ACCOUNT = 'cuiyuliang' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' }