Merge "Move from .md to .markdown for JJB docs"

[releng/builder.git] / jjb / yangtools / yangtools-verify.yaml

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 4f7db2b3bc318d78e4b2b4937d27f483e9fd9cdb..0754733852980e004804b3bed21cdd9fdfdd3f09 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -6,11 +6,15 @@
     jdk:
         - openjdk7
         - openjdk8
+
+    # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
     maven:
         - mvn31:
-            mvnver: "Maven 3.1.1"
+            mvnver: '{mvn31}'
         - mvn32:
-            mvnver: "Maven 3.2.5"
+            mvnver: '{mvn32}'
+        - mvn33:
+            mvnver: '{mvn33}'
 
     stream:
         - beryllium:
@@ -28,9 +32,9 @@
         - openjdk8
     maven:
         - mvn31:
-            mvnver: "Maven 3.1.1"
+            mvnver: '{mvn31}'
         - mvn32:
-            mvnver: "Maven 3.2.5"
+            mvnver: '{mvn32}'
 
     stream:
         - stable-lithium:
@@ -49,9 +53,9 @@
         - 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:
@@ -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'