Merge "Remove jjb custom scripting"

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index cecee685296ee252ff4c476b092c142f5a4bb3a1..80c991bdf1675a79df14ae59af774c89f3cd5dab 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -9,7 +9,7 @@
         - '{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)
@@ -22,6 +22,8 @@
     project-name: 'ovsdb'
     branch: 'master'
     jdk: openjdk8
+    jdks:
+        - openjdk8
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
@@ -42,7 +44,7 @@
         - '{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)
@@ -54,7 +56,8 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/beryllium'
-    jdk:
+    jdk: openjdk7
+    jdks:
         - openjdk7
         - openjdk8
     maven:
@@ -77,7 +80,7 @@
         - '{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)
@@ -90,6 +93,8 @@
     project-name: 'ovsdb'
     branch: 'stable/lithium'
     jdk: openjdk7
+    jdks:
+        - openjdk7
     maven:
         - mvn33:
             mvn-version: '{mvn33}'