From 34cc98107df9ccf782eb7a3d023ad458af5657ff Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 8 Mar 2018 22:22:50 +0000 Subject: [PATCH 1/4] Only deploy when remote repo url is https --- Jenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 0e9f8ea..02c109f 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -64,7 +64,7 @@ pipeline { } } stage('Deploy') { - when { expression { (env.GIT_BRANCH == 'master') } } + when { expression { (env.GIT_BRANCH == 'master' && env.GIT_URL.startsWith('https://')) } } steps { withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { sh "${mvn} deploy --activate-profiles release -DskipTests=true" From 9a5dcb5e7abef41aebfbd4edef49df108502fe33 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 10 Mar 2018 18:16:47 +0000 Subject: [PATCH 2/4] jenkins: update template * Use generic maven and jdk names * Add sonarqube reporting --- Jenkinsfile.groovy | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 02c109f..7198d71 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -13,43 +13,47 @@ pipeline { when { expression { (env.GIT_BRANCH == 'master' || env.CHANGE_TARGET == 'master') && - (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") } + (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") + } } steps { error("Build failed because SNAPSHOT version") } } stage('Static Code Analysis') { + when { expression { findFiles(glob: '**/src/main/java/**/*.java').length > 0 } } steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { - sh "${mvn} compile checkstyle:checkstyle pmd:pmd" + withMaven(maven: 'maven', jdk: 'JDK LTS') { + sh "${mvn} compile" + sh "${mvn} checkstyle:checkstyle" + sh "${mvn} pmd:pmd" + pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' + withSonarQubeEnv('sonarqube') { + sh "${mvn} org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar" + } } - pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' } } - stage('Build') { - parallel { - stage('Java 8') { - steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { - sh "${mvn} clean install" - } - } + stage('Build Java Next') { + steps { + withMaven(maven: 'maven', jdk: 'JDK Next') { + sh "${mvn} clean install" } - stage('Java 9') { - steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { - sh "${mvn} clean install" - } - } + } + } + stage('Build Java LTS') { + steps { + withMaven(maven: 'maven', jdk: 'JDK LTS') { + sh "${mvn} clean install" } } } stage('Test Results') { + when { expression { findFiles(glob: '**/target/surefire-reports/*.xml').length > 0 } } steps { junit '**/target/surefire-reports/*.xml' jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class' - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + withMaven(maven: 'maven', jdk: 'JDK LTS') { sh "${mvn} com.gavinmogan:codacy-maven-plugin:coverage " + "-DcoverageReportFile=target/site/jacoco/jacoco.xml " + "-DprojectToken=`$JENKINS_HOME/codacy/token` " + @@ -59,6 +63,7 @@ pipeline { } } stage('Archiving') { + when { expression { findFiles(glob: '**/target/*.jar').length > 0 } } steps { archiveArtifacts '**/target/*.jar' } @@ -66,7 +71,7 @@ pipeline { stage('Deploy') { when { expression { (env.GIT_BRANCH == 'master' && env.GIT_URL.startsWith('https://')) } } steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + withMaven(maven: 'maven', jdk: 'JDK LTS') { sh "${mvn} deploy --activate-profiles release -DskipTests=true" } } From ca46ee0d0fd3d559bd9f6084dbc5a55cfbbd3ddc Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 11 Mar 2018 19:25:51 +0000 Subject: [PATCH 3/4] jenkins: update to template --- Jenkinsfile.groovy | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 7198d71..9207dae 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -28,7 +28,14 @@ pipeline { sh "${mvn} checkstyle:checkstyle" sh "${mvn} pmd:pmd" pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' - withSonarQubeEnv('sonarqube') { + } + } + } + stage('SonarQube (develop only)') { + when { expression { env.GIT_BRANCH == 'develop' && env.GIT_URL.startsWith('https://') } } + steps { + withSonarQubeEnv('sonarqube') { + withMaven(maven: 'maven', jdk: 'JDK LTS') { sh "${mvn} org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar" } } @@ -37,7 +44,7 @@ pipeline { stage('Build Java Next') { steps { withMaven(maven: 'maven', jdk: 'JDK Next') { - sh "${mvn} clean install" + sh "${mvn} clean install -Djava.version=9" } } } From 672e537153929667b4d097ec9bec2f6f5e53044e Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 21 Jun 2018 18:10:41 +0100 Subject: [PATCH 4/4] jenkins: update to master/release branch model --- Jenkinsfile.groovy | 105 +++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 9207dae..443c1a9 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -1,38 +1,43 @@ -final String mvn = "mvn --batch-mode --update-snapshots" +final String mvn = "mvn --batch-mode --update-snapshots --errors" +final dependenciesSupportJDK = 9 pipeline { agent any stages { - stage('Environment') { - steps { - sh 'set' - } - } - stage('no SNAPSHOT in master') { - // checks that the pom version is not a snapshot when the current or target branch is master + stage('release != SNAPSHOT') { + // checks that the pom version is not a SNAPSHOT when the current branch is a release when { expression { - (env.GIT_BRANCH == 'master' || env.CHANGE_TARGET == 'master') && + (branchStartsWith('release/')) && (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") } } steps { - error("Build failed because SNAPSHOT version") + error("Build failed because SNAPSHOT version: [" + env.GIT_BRANCH + "]") } } - stage('Static Code Analysis') { - when { expression { findFiles(glob: '**/src/main/java/**/*.java').length > 0 } } + stage('Build & Test') { steps { withMaven(maven: 'maven', jdk: 'JDK LTS') { - sh "${mvn} compile" - sh "${mvn} checkstyle:checkstyle" - sh "${mvn} pmd:pmd" + sh "${mvn} clean compile checkstyle:checkstyle pmd:pmd test" + jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class' pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' + step([$class : 'hudson.plugins.checkstyle.CheckStylePublisher', + pattern : '**/target/checkstyle-result.xml', + healthy : '20', + unHealthy: '100']) } } } - stage('SonarQube (develop only)') { - when { expression { env.GIT_BRANCH == 'develop' && env.GIT_URL.startsWith('https://') } } + stage('Verify & Install') { + steps { + withMaven(maven: 'maven', jdk: 'JDK LTS') { + sh "${mvn} -DskipTests install" + } + } + } + stage('SonarQube (gitlab only)') { + when { expression { isPublished() } } steps { withSonarQubeEnv('sonarqube') { withMaven(maven: 'maven', jdk: 'JDK LTS') { @@ -41,47 +46,45 @@ pipeline { } } } - stage('Build Java Next') { - steps { - withMaven(maven: 'maven', jdk: 'JDK Next') { - sh "${mvn} clean install -Djava.version=9" + stage('Deploy (release on gitlab)') { + when { + expression { + (branchStartsWith('release/') && isPublished()) } } - } - stage('Build Java LTS') { - steps { - withMaven(maven: 'maven', jdk: 'JDK LTS') { - sh "${mvn} clean install" - } - } - } - stage('Test Results') { - when { expression { findFiles(glob: '**/target/surefire-reports/*.xml').length > 0 } } - steps { - junit '**/target/surefire-reports/*.xml' - jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class' - withMaven(maven: 'maven', jdk: 'JDK LTS') { - sh "${mvn} com.gavinmogan:codacy-maven-plugin:coverage " + - "-DcoverageReportFile=target/site/jacoco/jacoco.xml " + - "-DprojectToken=`$JENKINS_HOME/codacy/token` " + - "-DapiToken=`$JENKINS_HOME/codacy/apitoken` " + - "-Dcommit=`git rev-parse HEAD`" - } - } - } - stage('Archiving') { - when { expression { findFiles(glob: '**/target/*.jar').length > 0 } } - steps { - archiveArtifacts '**/target/*.jar' - } - } - stage('Deploy') { - when { expression { (env.GIT_BRANCH == 'master' && env.GIT_URL.startsWith('https://')) } } steps { withMaven(maven: 'maven', jdk: 'JDK LTS') { sh "${mvn} deploy --activate-profiles release -DskipTests=true" } } } + stage('Build Java 9') { + when { expression { dependenciesSupportJDK >= 9 } } + steps { + withMaven(maven: 'maven', jdk: 'JDK 9') { + sh "${mvn} clean verify -Djava.version=9" + } + } + } + stage('Build Java 10') { + when { expression { dependenciesSupportJDK >= 10 } } + steps { + withMaven(maven: 'maven', jdk: 'JDK 10') { + sh "${mvn} clean verify -Djava.version=10" + } + } + } } } + +private boolean branchStartsWith(String branchName) { + startsWith(env.GIT_BRANCH, branchName) +} + +private boolean isPublished() { + startsWith(env.GIT_URL, 'https://') +} + +private boolean startsWith(String value, String match) { + value != null && value.startsWith(match) +}