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

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