Merge "Restore older OpFlex build streams and further fixes to carbon build"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 8a3d358ffe3acef693958854d4a4daadf8c072b6..a2472d9925cdc38c8e001bb5b0dcf59c1909d4dd 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: yangtools-boron
+    name: yangtools-carbon
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -9,12 +8,12 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
+        - carbon:
             disable_autorelease: False
             disable_distribution_check: False
 
@@ -22,20 +21,20 @@
     project-name: 'yangtools'
     branch: 'master'
     jdk: openjdk8
+    jdks:
+        - openjdk8
     maven:
-        - mvn32:
-            mvn-version: '{mvn32}'
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
 - project:
-    name: yangtools-beryllium
+    name: yangtools-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -44,33 +43,35 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/beryllium'
-    jdk:
-      - openjdk7
-      - openjdk8
+    branch: 'stable/boron'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
     maven:
         - mvn32:
             mvn-version: '{mvn32}'
         - mvn33:
             mvn-version: '{mvn33}'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
 - project:
-    name: yangtools-stable-lithium
+    name: yangtools-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -79,24 +80,27 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdk}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
+        - beryllium:
+            disable_autorelease: False
+            disable_distribution_check: False
 
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/lithium'
+    branch: 'stable/beryllium'
     jdk: openjdk7
+    jdks:
+      - openjdk7
+      - openjdk8
     maven:
-        - mvn31:
-            mvn-version: '{mvn31}'
         - mvn32:
             mvn-version: '{mvn32}'
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
@@ -111,5 +115,5 @@
     project-name: 'yangtools'
     branch: 'master'
     mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'