Remove old matrix type verify jobs

With the new {project-name}-verify-{stream}-{maven}-{jdk} job type
working there is no longer a need to maintain the old matrix style
verify job.

Change-Id: I4bfb379e792ad5238f34eb463988283768144c3d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 724cfd7a1e39ccf8e3f519c603fd123ce6949663..cecee685296ee252ff4c476b092c142f5a4bb3a1 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -9,21 +9,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # 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: 'ovsdb'
     project-name: 'ovsdb'
+    branch: 'master'
     jdk: openjdk8
     maven:
         - mvn33:
@@ -45,22 +42,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # 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: 'ovsdb'
     project-name: 'ovsdb'
+    branch: 'stable/beryllium'
     jdk:
         - openjdk7
         - openjdk8
@@ -84,21 +77,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # 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: 'ovsdb'
     project-name: 'ovsdb'
+    branch: 'stable/lithium'
     jdk: openjdk7
     maven:
         - mvn33: