Merge "Cleanup of SXP Jenkins Jobs"

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

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 0754733852980e004804b3bed21cdd9fdfdd3f09..bc41f7e7df4b4443567563a2991977fd664e9ccb 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -1,65 +1,63 @@
 - project:
-    name: yangtools-verify-beryllium
+    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: '{mvn31}'
         - mvn32:
             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: '{mvn31}'
         - mvn32:
             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: '{mvn31}'
         - mvn32:
             mvnver: '{mvn32}'
 
     stream:
-        - stable-helium:
-            branch: stable/helium
+        - stable-lithium:
+            branch: stable/lithium
 
     project: 'yangtools'
 
@@ -80,8 +78,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm: