From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 9 Sep 2015 17:31:46 +0000 (+0200)
Subject: Add Maven 3.3.3 to yangtools-verify-beryllium matrix
X-Git-Tag: release/beryllium~552^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=cdd2f2e95c80fff289e44927b17248d9e987c8d0;p=releng%2Fbuilder.git

Add Maven 3.3.3 to yangtools-verify-beryllium matrix

Yangtools project claims to support Maven 3.3.3 in Beryllium,
so yangtools-verify-beryllium job should also include that version.

Also, releng-defaults values {mvn31}, {mvn32} and {mvn33} are now used.

yangtools-verify for other streams still only goes up to mvn32.

Change-Id: I26d3522c0835283b5d8664e0a528f6fe1b2e0118
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index c4983c2dc..075473385 100644
--- 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: