X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools-verify.yaml;h=203af2ceecba954fd46058ee55e81fa80bc99e70;hb=05b56edd7800a007b6d78f6144995397eb4b573e;hp=8700dd616fe6853c6a57c24319b08a348f41a068;hpb=718faa1220ede5fe29762ca19041c86a06e6b78b;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 8700dd616..203af2cee 100644
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -1,41 +1,63 @@
 - project:
-    name: yangtools-verify-master
+    name: yangtools-verify-boron
     jobs:
         - 'yangtools-verify-{stream}-{maven}-{jdk}'
 
     jdk:
-        - openjdk7
         - openjdk8
+
+    # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
     maven:
-        - mvn31:
-            mvnver: "Maven 3.1.1"
         - mvn32:
-            mvnver: "Maven 3.2.5"
+            mvnver: '{mvn32}'
+        - mvn33:
+            mvnver: '{mvn33}'
 
     stream:
-        - master:
+        - boron:
             branch: master
 
     project: 'yangtools'
 
 - project:
-    name: yangtools-verify-helium
+    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:
-        - mvn30:
-            mvnver: "Maven 3.0.5"
         - mvn31:
-            mvnver: "Maven 3.1.1"
+            mvnver: '{mvn31}'
         - mvn32:
-            mvnver: "Maven 3.2.5"
+            mvnver: '{mvn32}'
 
     stream:
-        - stable-helium:
-            branch: stable/helium
+        - stable-lithium:
+            branch: stable/lithium
 
     project: 'yangtools'
 
@@ -44,6 +66,7 @@
 
     project-type: maven
     node: dynamic_verify
+    concurrent: true
     jdk: '{jdk}'
 
     logrotate:
@@ -66,13 +89,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'