Decode Base64 before parsing Gerrit comment

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ee5c1b76cfc8d9c060e947b60e81f02f1041ce7a..bd6f2fef58cd9f70ca9d9736208f8096fb2b1059 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -1,9 +1,29 @@
 ---
+- job-group:
+    name: odl-maven-jobs-jdk11
+
+    jobs:
+      - gerrit-maven-clm:
+          nexus-iq-namespace: odl-
+          nexus-iq-stage: release
+
+      - gerrit-maven-merge:
+          build-timeout: 180
+
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          cron: ''
+
+    java-version: openjdk11
+    mvn-version: mvn35
+
 - job-group:
     name: odl-maven-jobs
 
     jobs:
-      - gerrit-maven-clm
+      - gerrit-maven-clm:
+          nexus-iq-namespace: odl-
+          nexus-iq-stage: release
 
       # TODO: Figure out what's wrong with the gerrit-maven-merge job.
       # - gerrit-maven-merge:
@@ -15,8 +35,22 @@
       - '{project-name}-merge-{stream}':
           build-timeout: 180
           mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
+          disable-job: '{disable-job}'
+
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          mvn-central: false
+          ossrh-profile-id: 6386ebbbf3a563
+          cron: ''
+
+    java-version: openjdk8
+    mvn-version: mvn35
+    disable-job: '{disable-job}'
+
+- job-group:
+    name: odl-maven-verify-jobs
 
-      - gerrit-maven-release
+    jobs:
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
@@ -37,6 +71,7 @@
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
+    disable-job: false
 
     #####################
     # Job Configuration #
@@ -45,6 +80,7 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -73,8 +109,8 @@
           result: 'success'
 
     builders:
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
+      - lf-jacoco-nojava-workaround
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
@@ -103,6 +139,7 @@
     ######################
     # Default parameters #
     ######################
+    disable-job: 'false'
 
     archive-artifacts: >
       **/*.log
@@ -126,6 +163,7 @@
     project-type: maven
     node: '{build-node}'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -162,8 +200,8 @@
           forbidden-files: ''
 
     prebuilders:
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
+      - lf-jacoco-nojava-workaround
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - lf-maven-install: