Migrate vpnservice matrix-verify jobs to freestyle-verify jobs

This patch will:

* Delete the existing {project-name}-verify-{stream} jobs
* Create new jobs {project-name}-verify-{stream}-{maven}-{jdk} jobs

This work is related to our infra changes mentioned on the mailing list
(see below for link). We'd like to migrate jobs away from using the
matrix type jobs and convert them to freestyle jobs as the matrix system
occassionally causes us build issues especially with larger queue sizes.

See:
https://lists.opendaylight.org/pipermail/release/2016-July/007288.html

Change-Id: I8980ea51da5a39b2a3902c170e550de50e9886bf
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index fdb3b257fec8455125cb9420bdb9bcd408592f59..dce12c7e33ddc1952837f51b80a087c40c771a23 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -1,6 +1,6 @@
 # ODL Releng build templates
 - project:
-    name: vpnservice
+    name: vpnservice-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,41 +8,105 @@
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{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'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+    project: 'vpnservice'
+    project-name: 'vpnservice'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'vpnservice-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[vpnservice] [openflowplugin] [neutron]'
+    archive-artifacts: ''
+
+- project:
+    name: vpnservice-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{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'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+    project: 'vpnservice'
+    project-name: 'vpnservice'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'vpnservice-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[vpnservice] [openflowplugin] [neutron]'
+    archive-artifacts: ''
+
+- project:
+    name: vpnservice-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'vpnservice'
     project-name: 'vpnservice'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'vpnservice-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[vpnservice] [openflowplugin] [neutron]'
     archive-artifacts: ''
+
+- project:
+    name: vpnservice-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'vpnservice'
+    project-name: 'vpnservice'
+    mvn-settings: 'vpnservice-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'