X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools-verify.yaml;h=bc41f7e7df4b4443567563a2991977fd664e9ccb;hb=6ee7cebd1f2c27f102a435aacc51e6b39a9432f0;hp=f6cbc070906e6ac82b3b9f0d70c91b9c554ad86b;hpb=b61325eaee390aaed178db566b1a78719719fc59;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index f6cbc0709..bc41f7e7d 100644
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -1,61 +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:
-        - beryllium:
+        - boron:
             branch: master
 
     project: 'yangtools'
 
 - project:
-    name: yangtools-verify-lithium
+    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:
-        - mvn31:
-            mvnver: "Maven 3.1.1"
         - mvn32:
-            mvnver: "Maven 3.2.5"
+            mvnver: '{mvn32}'
+        - mvn33:
+            mvnver: '{mvn33}'
 
     stream:
-        - stable-lithium:
-            branch: stable/lithium
+        - beryllium:
+            branch: stable/beryllium
 
     project: 'yangtools'
 
 - project:
-    name: yangtools-verify-helium
+    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'
 
@@ -76,8 +78,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -95,6 +99,11 @@
             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'