Merge "Remove jjb custom scripting"

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 7cfa798c273efa2c347447b49932846b9b151ba3..e611fab237a49c37ecfe785c6b7956ba57adfdaa 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -9,22 +9,21 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{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:
-            branch: 'master'
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'master'
     jdk: openjdk8
+    jdks:
+        - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
@@ -45,23 +44,20 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{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:
-            branch: 'stable/beryllium'
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'odlparent'
     project-name: 'odlparent'
-    jdk:
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
         - openjdk7
         - openjdk8
     maven:
@@ -85,22 +81,21 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{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:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'stable/lithium'
     jdk: openjdk7
+    jdks:
+        - openjdk7
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
@@ -116,14 +111,9 @@
     jobs:
         - '{project-name}-sonar'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'master'
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'