Migrate lispflowmapping 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: I3bb6ba5e762ad695a02ba67c2d1ab80eed2e9839
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index c11899821bff07dff67f06d568f6075d15b29eb2..0453c377ae5f753f7122d1a7ef5ee78ce14283f0 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,6 +1,6 @@
 # ODL Releng build templates
 - project:
-    name: lispflowmapping
+    name: lispflowmapping-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,39 +8,90 @@
         - '{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: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    archive-artifacts: ''
+    build-node: centos7-java-builder-4c-8g
+
+- project:
+    name: lispflowmapping-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:
         - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
+    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
+    archive-artifacts: ''
+    build-node: centos7-java-builder-4c-8g
+
+- project:
+    name: lispflowmapping-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
-                - openjdk8
             disable_autorelease: True
             disable_distribution_check: True
-
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
@@ -48,3 +99,14 @@
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
+
+- project:
+    name: lispflowmapping-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'