From 72d73a9874da60affb9f2d4aecb9fb4a7d603911 Mon Sep 17 00:00:00 2001 From: Dennis Tait Date: Sun, 26 Apr 2020 12:09:31 +0100 Subject: [PATCH 1/6] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index dec0cebf..cf401774 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 = 'taitd' + GITHUB_ACCOUNT = 'taitd' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' } From c424895f98f4b2cbd0425f3b8b292c335d189330 Mon Sep 17 00:00:00 2001 From: Dennis Tait Date: Sun, 26 Apr 2020 14:37:23 +0100 Subject: [PATCH 2/6] Dockerhub access fix Dockerhub access credentials --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index cf401774..37d71e89 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,7 +14,7 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'taitd' + DOCKERHUB_NAMESPACE = 'https://github.com/taitd/' GITHUB_ACCOUNT = 'taitd' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' From 1686fe4de6118db1707b94c9b05f84bb6e008dba Mon Sep 17 00:00:00 2001 From: Dennis Tait Date: Sun, 26 Apr 2020 14:52:06 +0100 Subject: [PATCH 3/6] remove slash remove slash from dockerhub url --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 37d71e89..d58cb9a5 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,7 +14,7 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'https://github.com/taitd/' + DOCKERHUB_NAMESPACE = 'https://github.com/taitd' GITHUB_ACCOUNT = 'taitd' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' From f33292af9080bc40a6a97c157527b929e00f510d Mon Sep 17 00:00:00 2001 From: Dennis Tait Date: Sun, 26 Apr 2020 15:03:21 +0100 Subject: [PATCH 4/6] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index d58cb9a5..cf401774 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,7 +14,7 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'https://github.com/taitd' + DOCKERHUB_NAMESPACE = 'taitd' GITHUB_ACCOUNT = 'taitd' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' From aafd8fb2375b96a344af6bb085164033e40c951e Mon Sep 17 00:00:00 2001 From: Dennis Tait Date: Sun, 26 Apr 2020 15:03:44 +0100 Subject: [PATCH 5/6] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index cf401774..cc7e31f4 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -34,7 +34,7 @@ pipeline { } } } - + stage('sonarqube analysis') { steps { container ('maven') { From 710f521ecf2fc714485007bc4db7381ce5d74a36 Mon Sep 17 00:00:00 2001 From: Dennis Tait Date: Mon, 27 Apr 2020 22:04:25 +0100 Subject: [PATCH 6/6] artifacts to keep 1 options { buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '30')) --- Jenkinsfile-online | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index cc7e31f4..2e196a85 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -1,4 +1,7 @@ pipeline { + options { + buildDiscarder(logRotator(numToKeepStr: '1', artifactNumToKeepStr: '1')) + } agent { node { label 'maven'