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 364f35509291be2af8a25b6a19a8c617aaec4b89..bc41f7e7df4b4443567563a2991977fd664e9ccb 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -30,8 +30,6 @@
 
     # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
     maven:
-        - mvn31:
-            mvnver: '{mvn31}'
         - mvn32:
             mvnver: '{mvn32}'
         - mvn33:
@@ -63,27 +61,6 @@
 
     project: 'yangtools'
 
-- project:
-    name: yangtools-verify-helium
-    jobs:
-        - 'yangtools-verify-{stream}-{maven}-{jdk}'
-
-    jdk:
-        - openjdk7
-    maven:
-        - mvn30:
-            mvnver: "Maven 3.0.5"
-        - mvn31:
-            mvnver: '{mvn31}'
-        - mvn32:
-            mvnver: '{mvn32}'
-
-    stream:
-        - stable-helium:
-            branch: stable/helium
-
-    project: 'yangtools'
-
 - job-template:
     name: 'yangtools-verify-{stream}-{maven}-{jdk}'
 
@@ -101,8 +78,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm: