Convert distribution jobs to be regular jjb templates

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

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 9d4b878dde63ea36cfe30dfb634c664ae4bc3496..a8d941e0fe1a4411ae47ae9f62b3d0eb16e1a2fa 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -1,41 +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:
-        - master:
+        - boron:
             branch: master
 
     project: 'yangtools'
 
 - project:
-    name: yangtools-verify-helium
+    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:
+        - mvn32:
+            mvnver: '{mvn32}'
+        - mvn33:
+            mvnver: '{mvn33}'
+
+    stream:
+        - beryllium:
+            branch: stable/beryllium
+
+    project: 'yangtools'
+
+- project:
+    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'
 
@@ -56,31 +78,39 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
             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'
         goals: '-Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{yangtools-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'yangtools-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         ignore-upstream-changes: true
 
     publishers: