X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=bd6f2fef58cd9f70ca9d9736208f8096fb2b1059;hb=0e7e17b4076d5f2f5a76f0c945d5c9381bb9c97d;hp=89869dccde90eadd01f22ddc581100b9154c8f4f;hpb=ebe737ff767751b562b36673d94a568dfc361341;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 89869dccd..bd6f2fef5 100644
--- 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,12 +35,28 @@
       - '{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-release
+      - 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
+
+    jobs:
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
+    mvn-version: mvn35
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
@@ -35,6 +71,7 @@
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
+    disable-job: false
 
     #####################
     # Job Configuration #
@@ -43,6 +80,7 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -71,12 +109,12 @@
           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:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           goals: |
               {mvn-goals}
               {opendaylight-infra-mvn-opts}
@@ -101,6 +139,7 @@
     ######################
     # Default parameters #
     ######################
+    disable-job: 'false'
 
     archive-artifacts: >
       **/*.log
@@ -108,8 +147,9 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
+    cron: '@daily'
     mvn-opts: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     java-version: openjdk8
 
     #####################
@@ -123,6 +163,7 @@
     project-type: maven
     node: '{build-node}'
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -150,15 +191,17 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 0'
+      - timed: '{obj:cron}'
       - gerrit-trigger-patch-merged:
           gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'
+          files: '**'
+          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:
@@ -192,6 +235,3 @@
           deploy-unstable: false
       - lf-jacoco-report
       - lf-infra-publish
-      - trigger:
-          project: 'distribution-merge-{stream}'
-          threshold: SUCCESS