X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools-verify.yaml;h=57477d8c8f3d63f76cbb8f3274ca3abe568402a0;hb=refs%2Fchanges%2F42%2F34042%2F1;hp=0e750b1e5247e0b727c172d83300df8dd1430b35;hpb=4cc75fa9cd798b30610b97f847de61016953fa4a;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 0e750b1e5..57477d8c8 100644
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -1,32 +1,80 @@
 - project:
-    name: yangtools-verify-master
+    name: yangtools-verify-boron
     jobs:
-        - 'yangtools-verify-{stream}-{maven}'
+        - 'yangtools-verify-{stream}-{maven}-{jdk}'
 
+    jdk:
+        - openjdk8
+
+    # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
     maven:
-        - mvn31:
-            mvnver: "Maven 3.1.1"
         - mvn32:
-            mvnver: "Maven 3.2.3"
+            mvnver: '{mvn32}'
+        - mvn33:
+            mvnver: '{mvn33}'
 
     stream:
-        - master:
+        - boron:
             branch: master
 
     project: 'yangtools'
 
+- project:
+    name: yangtools-verify-beryllium
+    jobs:
+        - 'yangtools-verify-{stream}-{maven}-{jdk}'
+
+    jdk:
+        - openjdk7
+        - openjdk8
+
+    # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
+    maven:
+        - mvn32:
+            mvnver: '{mvn32}'
+        - mvn33:
+            mvnver: '{mvn33}'
+
+    stream:
+        - beryllium:
+            branch: stable/beryllium
+
+    project: 'yangtools'
+
+- project:
+    name: yangtools-verify-lithium
+    jobs:
+        - 'yangtools-verify-{stream}-{maven}-{jdk}'
+
+    jdk:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn31:
+            mvnver: '{mvn31}'
+        - mvn32:
+            mvnver: '{mvn32}'
+
+    stream:
+        - stable-lithium:
+            branch: stable/lithium
+
+    project: 'yangtools'
+
 - project:
     name: yangtools-verify-helium
     jobs:
-        - 'yangtools-verify-{stream}-{maven}'
+        - 'yangtools-verify-{stream}-{maven}-{jdk}'
 
+    jdk:
+        - openjdk7
     maven:
         - mvn30:
             mvnver: "Maven 3.0.5"
         - mvn31:
-            mvnver: "Maven 3.1.1"
+            mvnver: '{mvn31}'
         - mvn32:
-            mvnver: "Maven 3.2.3"
+            mvnver: '{mvn32}'
 
     stream:
         - stable-helium:
@@ -35,10 +83,12 @@
     project: 'yangtools'
 
 - job-template:
-    name: 'yangtools-verify-{stream}-{maven}'
+    name: 'yangtools-verify-{stream}-{maven}-{jdk}'
 
     project-type: maven
     node: dynamic_verify
+    concurrent: true
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -60,13 +110,19 @@
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
             name: 'yangtools'
             branch: '{branch}'
 
+    prebuilders:
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{yangtools-settings}'
+
     maven:
         maven-name: '{mvnver}'
         root-pom: 'pom.xml'
@@ -74,7 +130,7 @@
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{yangtools-settings}'
         global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: false
+        ignore-upstream-changes: true
 
     publishers:
         - email-notification: