Adopt latest changes to build pipelines

Signed-off-by: Kai Hudalla <[email protected]>
eclipse-hono · May 26, 2020 · e02d668 · e02d668
1 parent e997923
commit e02d668
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 28 deletions.
diff --git a/jenkins/Hono-CI-Pipeline.groovy b/jenkins/Hono-CI-Pipeline.groovy
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 
 /*******************************************************************************
- * Copyright (c) 2016, 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -27,7 +27,6 @@ node {
         utils.checkOutHonoRepoMaster()
         utils.build()
         utils.aggregateJunitResults()
-        utils.captureCodeCoverageReport()
         currentBuild.result = 'SUCCESS'
     } catch (err) {
         currentBuild.result = 'FAILURE'

diff --git a/jenkins/Hono-Deploy-Eclipse-Pipeline.groovy b/jenkins/Hono-Deploy-Eclipse-Pipeline.groovy
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 
 /*******************************************************************************
- * Copyright (c) 2016, 2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -56,7 +56,7 @@ def buildAndDeploy(def utils) {
         withMaven(maven: utils.getMavenVersion(),
                 jdk: utils.getJDKVersion(),
                 mavenLocalRepo: '.repository',
-                options: [jacocoPublisher(disabled: true), artifactsPublisher(disabled: true)]) {
+                options: [artifactsPublisher(disabled: true)]) {
             sh "mvn --projects :hono-service-auth,:hono-service-device-registry,:hono-service-device-connection,:hono-adapter-http-vertx,:hono-adapter-mqtt-vertx,:hono-adapter-kura,:hono-adapter-amqp-vertx,:hono-adapter-lora-vertx,:hono-adapter-sigfox-vertx,:hono-example,:hono-cli -am deploy -DskipTests=true -DcreateJavadoc=true -DenableEclipseJarSigner=true -DskipStaging=true"
         }
     }

diff --git a/jenkins/Hono-Deploy-Maven-Central-Pipeline.groovy b/jenkins/Hono-Deploy-Maven-Central-Pipeline.groovy
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 
 /*******************************************************************************
- * Copyright (c) 2016, 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -61,7 +61,7 @@ def buildAndDeploy(def utils) {
                 jdk: utils.getJDKVersion(),
                 mavenLocalRepo: '.repository',
                 mavenSettingsFilePath: "${params.MAVEN_SETTINGS_FILE}",
-                options: [jacocoPublisher(disabled: true), artifactsPublisher(disabled: true)]) {
+                options: [artifactsPublisher(disabled: true)]) {
             sh "mvn deploy -X -pl :hono-service-auth,:hono-service-device-registry,:hono-service-device-connection,:hono-adapter-http-vertx,:hono-adapter-mqtt-vertx,:hono-adapter-kura,:hono-adapter-amqp-vertx,:hono-adapter-lora-vertx,:hono-adapter-sigfox-vertx,:hono-example,:hono-cli -am -DskipTests=true -DcreateGPGSignature=true -DcreateJavadoc=true -DenableEclipseJarSigner=true"
         }
     }

diff --git a/jenkins/Hono-Nightly-Pipeline.groovy b/jenkins/Hono-Nightly-Pipeline.groovy
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 
 /*******************************************************************************
- * Copyright (c) 2016, 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -27,7 +27,6 @@ node {
         utils.checkOutHonoRepoMaster()
         nightlyBuild(utils)
         utils.aggregateJunitResults()
-        utils.captureCodeCoverageReport()
         utils.publishJavaDoc()
         utils.archiveArtifacts("deploy/target/eclipse-hono-deploy-*.tar.gz,cli/target/hono-cli-*-exec.jar")
         currentBuild.result = 'SUCCESS'
@@ -48,9 +47,9 @@ node {
  */
 def nightlyBuild(def utils) {
     stage('Build') {
-        withMaven(maven: utils.getMavenVersion(), jdk: utils.getJDKVersion(), options: [jacocoPublisher(disabled: true), artifactsPublisher(disabled: true)]) {
+        withMaven(maven: utils.getMavenVersion(), jdk: utils.getJDKVersion(), options: [artifactsPublisher(disabled: true)]) {
             sh 'mvn clean package javadoc:aggregate'
-            sh 'mvn --projects :hono-service-auth,:hono-service-device-registry,:hono-adapter-http-vertx,:hono-adapter-mqtt-vertx,:hono-adapter-kura,:hono-adapter-amqp-vertx,:hono-adapter-lora-vertx,:hono-adapter-sigfox-vertx,:hono-adapter-coap-vertx,:hono-example,:hono-cli -am deploy -DcreateJavadoc=true -DenableEclipseJarSigner=true'
+            sh 'mvn --projects :hono-service-auth,:hono-service-device-registry,:hono-service-device-connection,:hono-adapter-http-vertx,:hono-adapter-mqtt-vertx,:hono-adapter-kura,:hono-adapter-amqp-vertx,:hono-adapter-lora-vertx,:hono-adapter-sigfox-vertx,:hono-adapter-coap-vertx,:hono-example,:hono-cli -am deploy -DcreateJavadoc=true -DenableEclipseJarSigner=true'
         }
     }
 }
diff --git a/jenkins/Hono-PipelineUtils.groovy b/jenkins/Hono-PipelineUtils.groovy
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 
 /*******************************************************************************
- * Copyright (c) 2016, 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -117,20 +117,6 @@ void notifyBuildStatus() {
     }
 }
 
-/**
- * Capture code coverage reports using Jacoco jenkins plugin.
- *
- */
-void captureCodeCoverageReport() {
-    stage('Capture Code Coverage Report') {
-        step([$class       : 'JacocoPublisher',
-              execPattern  : '**/**.exec',
-              classPattern : '**/classes',
-              sourcePattern: '**/src/main/java'
-        ])
-    }
-}
-
 /**
  * Archive build artifacts.
  *

diff --git a/jenkins/Hono-Release-Pipeline.groovy b/jenkins/Hono-Release-Pipeline.groovy
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 
 /*******************************************************************************
- * Copyright (c) 2016, 2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -87,7 +87,7 @@ def checkOut() {
  */
 def setReleaseVersionAndBuild(def utils) {
     stage('Build') {
-        withMaven(maven: utils.getMavenVersion(), jdk: utils.getJDKVersion(), options: [jacocoPublisher(disabled: true), artifactsPublisher(disabled: true)]) {
+        withMaven(maven: utils.getMavenVersion(), jdk: utils.getJDKVersion(), options: [artifactsPublisher(disabled: true)]) {
             sh "mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${RELEASE_VERSION}"
             sh 'mvn clean install javadoc:aggregate -Dmaven.test.failure.ignore=false -DenableEclipseJarSigner=true -DsnapshotDependencyAllowed=false -Ddocker.skip.build=true'
         }
@@ -145,7 +145,7 @@ def commitAndTag() {
  */
 def setNextVersion(def utils) {
     stage("Set next version") {
-        withMaven(maven: utils.getMavenVersion(), jdk: utils.getJDKVersion(), options: [jacocoPublisher(disabled: true), artifactsPublisher(disabled: true)]) {
+        withMaven(maven: utils.getMavenVersion(), jdk: utils.getJDKVersion(), options: [artifactsPublisher(disabled: true)]) {
             sh "mvn versions:set -DallowSnapshots=true -DgenerateBackupPoms=false -DnewVersion=${NEXT_VERSION}"
         }
     }