Merge "Migrate docs-rtd to archive-builds macro"

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

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 4dab955d050db602e16d2a8276486e58dfee30c2..4df26fadcde06dce8e2d87db602058039bc9db5d 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -1,67 +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:
-        - pre-boron:
-            branch: pre-boron
-        - 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,21 +76,20 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -103,16 +98,18 @@
 
     prebuilders:
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-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: