From: Luis Gomez <ecelgp@gmail.com>
Date: Thu, 21 Jul 2016 21:53:01 +0000 (+0000)
Subject: Merge "Remove jjb custom scripting"
X-Git-Tag: release/beryllium-sr3~108
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0bce2deec8afba3f0761959487c8d7d7773daa7b;hp=359ff75b09935750d9976edd6a48cee590cd66d4;p=releng%2Fbuilder.git

Merge "Remove jjb custom scripting"
---

diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh
index 25aa8a4ec..bca93210b 100755
--- a/jenkins-scripts/basic_settings.sh
+++ b/jenkins-scripts/basic_settings.sh
@@ -12,17 +12,7 @@ Host *
 
 # we don't want to do SSH host key checking on Rackspace spin-up systems
 # Dallas (ODL)
-Host 10.30.11.*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
-# Dallas (ODLForge)
-Host 10.30.12.*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
-# Chicago (ODL)
-Host 10.30.32.*
+Host 10.29.12.* 10.29.13.* 10.29.14.* 10.29.15.*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index dcf830bfe..d0960df99 100644
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,6 +1,6 @@
 # ODL Releng build templates
 - project:
-    name: aaa
+    name: aaa-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,41 +8,110 @@
         - '{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: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'aaa-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: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
+- project:
+    name: aaa-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: 'aaa'
+    project-name: 'aaa'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'aaa-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: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
+- project:
+    name: aaa-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:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'aaa'
     project-name: 'aaa'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'aaa-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: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
+
+- project:
+    name: aaa-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    mvn-settings: 'aaa-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 59deaee02..77db9221a 100644
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: armoury
+    name: armoury-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,35 +7,77 @@
         - '{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
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: False
+
+    project: 'armoury'
+    project-name: 'armoury'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'armoury-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: ''
+    email-upstream: '[armoury]'
+    archive-artifacts: ''
+
+- project:
+    name: armoury-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: openjdk8
-            jdks:
-                - openjdk8
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: False
 
     project: 'armoury'
     project-name: 'armoury'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'armoury-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: ''
     email-upstream: '[armoury]'
     archive-artifacts: ''
+
+- project:
+    name: armoury-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'armoury'
+    project-name: 'armoury'
+    branch: 'master'
+    mvn-settings: 'armoury-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index c9fc98c90..54544d538 100644
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: atrium
+    name: atrium-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,26 +7,39 @@
         - '{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: True
             disable_distribution_check: False
 
     project: 'atrium'
     project-name: 'atrium'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'atrium-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: '[atrium]'
     archive-artifacts: ''
+
+- project:
+    name: atrium-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    mvn-settings: 'atrium-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 6e1b22b7d..8485cb07e 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -4,7 +4,7 @@
     name: 'autorelease-release-{stream}'
 
     project-type: maven
-    node: centos7-autorelease-2c-16g
+    node: centos7-autorelease-4c-16g
     jdk: '{jdk}'
 
     logrotate:
diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 580d490d5..531e0415c 100644
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -37,7 +37,7 @@
     schedule: 'H H * * *'
 
     # Controller configuration
-    controller-image: 'centos7-java-8g'
+    controller-image: 'centos7-java-builder-2c-8g'
 
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
@@ -79,7 +79,7 @@
     schedule: 'H H * * *'
 
     # Controller configuration
-    controller-image: 'centos7-java-8g'
+    controller-image: 'centos7-java-builder-2c-8g'
 
     # Plot Info
     01-plot-title: 'Number of generated updates'
diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 34bad69d8..42b6a4cca 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: bgpcep
+    name: bgpcep-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,43 +7,117 @@
         - '{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: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-java-builder-4c-8g
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'bgpcep-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
+    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+    archive-artifacts: ''
+
+
+- project:
+    name: bgpcep-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: 'bgpcep'
+    project-name: 'bgpcep'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'bgpcep-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
+    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
+    archive-artifacts: ''
+    build-node: centos7-java-builder-4c-8g
+
+- project:
+    name: bgpcep-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:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'bgpcep'
     project-name: 'bgpcep'
+    build-node: centos7-java-builder-4c-8g
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'bgpcep-settings'
     mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
+
+- project:
+    name: bgpcep-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'bgpcep'
+    project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
+    branch: 'master'
+    mvn-settings: 'bgpcep-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index e329dc218..c2cdc59d2 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: capwap
+    name: capwap-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,20 +7,47 @@
         - '{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: 'capwap'
+    project-name: 'capwap'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'capwap-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: '[capwap]'
+    archive-artifacts: ''
+
+- project:
+    name: capwap-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
@@ -30,19 +56,67 @@
                 - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'capwap-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: '[capwap]'
+    archive-artifacts: ''
+
+- project:
+    name: capwap-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:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'capwap'
     project-name: 'capwap'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'capwap-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: '[capwap]'
     archive-artifacts: ''
+
+- project:
+    name: capwap
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: master
+    mvn-settings: 'capwap-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 41dfab80d..7dd57c385 100644
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: coretutorials
+    name: coretutorials-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,40 +7,110 @@
         - '{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: True
             disable_distribution_check: False
+
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'coretutorials-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: '[coretutorials]'
+    archive-artifacts: ''
+
+- project:
+    name: coretutorials-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
             disable_autorelease: True
             disable_distribution_check: False
+
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'coretutorials-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: '[coretutorials]'
+    archive-artifacts: ''
+
+- project:
+    name: coretutorials-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:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'coretutorials'
     project-name: 'coretutorials'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'coretutorials-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: '[coretutorials]'
     archive-artifacts: ''
+
+- project:
+    name: coretutorials-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: master
+    mvn-settings: 'coretutorials-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 18c009e5a..fc1223cee 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -44,7 +44,7 @@ echo "Configuring the startup features..."
 FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
 CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
 sed -ie "s/featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${ACTUALFEATURES}/g" \${FEATURESCONF}
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" \${FEATURESCONF}
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" \${FEATURESCONF}
 cat \${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 59e870e24..e8ca86e1b 100644
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -13,7 +13,10 @@
 ROBOT_VENV=`mktemp -d --suffix=robot_venv`
 echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
 
-virtualenv ${ROBOT_VENV}
+# The --system-site-packages parameter allows us to pick up system level
+# installed packages. This allows us to bake matplotlib which takes very long
+# to install into the image.
+virtualenv --system-site-packages ${ROBOT_VENV}
 source ${ROBOT_VENV}/bin/activate
 
 set -exu
@@ -29,7 +32,6 @@ pip install --upgrade jsonpath-rw
 
 # Modules for longevity framework robot library
 pip install elasticsearch==1.7.0 elasticsearch-dsl==0.0.11
-pip install --upgrade matplotlib
 
 # Print installed versions.
 pip freeze
diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 528c7becb..b7265586d 100644
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -42,7 +42,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
 
@@ -116,7 +116,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
 
     scm:
         - gerrit-trigger-scm:
@@ -220,7 +220,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -269,7 +269,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 806bcfc01..37b962ca2 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -465,7 +465,7 @@
                     mkdir $WORKSPACE/archives
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d $WORKSPACE/archives robot-plugin.zip
-                    mv *log* *.log *.csv $WORKSPACE/archives || true  # Don't fail if file missing
+                    mv *log* *.log *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True
diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index a883b2ca6..d50617f54 100644
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -18,6 +18,7 @@
                 - openjdk8
 
     project: 'netvirt'
+    archive-artifacts: 'docker-ovs-*.log'
 
 - job-template:
     name: 'netvirt-daily-full-integration-{stream}'
@@ -122,8 +123,7 @@
         - jacoco-nojava-workaround
 
     publishers:
-        - archive:
-            artifacts: 'docker-ovs-*.log'
-            fingerprint: false
         - email-notification:
             email-prefix: '[netvirt]'
+        - archive-build:
+            maven-version: '{mvn33}'
diff --git a/jjb/netvirt/netvirt-openstack.yaml b/jjb/netvirt/netvirt-openstack.yaml
index 4bf75245f..c6da032d4 100644
--- a/jjb/netvirt/netvirt-openstack.yaml
+++ b/jjb/netvirt/netvirt-openstack.yaml
@@ -4,6 +4,7 @@
         - 'netvirt-openstack-gerrit'
 
     project: 'netvirt'
+    archive-artifacts: 'logs/**'
 
 - job-template:
     name: 'netvirt-openstack-gerrit'
@@ -77,12 +78,11 @@
                 - include-raw-openstack-ci.sh
 
     publishers:
-        - archive:
-            artifacts: 'logs/**'
-            fingerprint: false
         - email-ext:
             subject: '[netvirt] $DEFAULT_SUBJECT'
             attach-build-log: false
             failure: true
             unstable: true
             fixed: true
+        - archive-build:
+            maven-version: '{mvn33}'
diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index fae791cd1..5eda1eff8 100644
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -85,3 +85,5 @@
         - email-notification:
             email-prefix: '[netvirt]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index be45ebe61..e611fab23 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.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: 'odlparent'
     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: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/beryllium'
-    jdk:
+    jdk: openjdk7
+    jdks:
         - openjdk7
         - openjdk8
     maven:
@@ -78,7 +81,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)
@@ -91,6 +94,8 @@
     project-name: 'odlparent'
     branch: 'stable/lithium'
     jdk: openjdk7
+    jdks:
+        - openjdk7
     maven:
         - mvn33:
             mvn-version: '{mvn33}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index f5e25308a..1b6dd8ca6 100644
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -20,7 +20,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index cecee6852..80c991bdf 100644
--- 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}'
diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/include-raw-build-rpm.sh
new file mode 100644
index 000000000..95a449795
--- /dev/null
+++ b/jjb/packaging/include-raw-build-rpm.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+# Install required packages
+virtualenv rpm_build
+source rpm_build/bin/activate
+pip install --upgrade pip
+pip install -r $WORKSPACE/packaging/rpm/requirements.txt
+
+# Build release specified by build params
+$WORKSPACE/packaging/rpm/build.py --major "$VERSION_MAJOR" \
+                                  --minor "$VERSION_MINOR" \
+                                  --patch "$VERSION_PATCH" \
+                                  --rpm "$RPM_RELEASE" \
+                                  --sysd_commit "$SYSD_COMMIT" \
+                                  --codename "$CODENAME" \
+                                  --download_url "$DOWNLOAD_URL" \
+                                  --changelog_date "$CHANGELOG_DATE" \
+                                  --changelog_name "$CHANGELOG_NAME" \
+                                  --changelog_email "$CHANGELOG_EMAIL"
diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index f3d1a6a6f..11b26319e 100644
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -1,11 +1,74 @@
 - project:
     name: packaging
+    project-name: packaging
+
     jobs:
         - '{project-name}-verify-python-{stream}'
+        - '{project-name}-build-rpm-{stream}'
+
+    project: 'integration/packaging'
 
     stream:
         - master:
             branch: 'master'
 
-    project: 'integration/packaging'
-    project-name: 'packaging'
+- job-template:
+    name: '{project-name}-build-rpm-{stream}'
+
+    node: dynamic_verify
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: 'rpm/cache/*.srpm rpm/cache/*.rpm'
+        - string:
+            name: VERSION_MAJOR
+            default: '4'
+            description: 'OpenDaylight major (element) version number to build'
+        - string:
+            name: VERSION_MINOR
+            default: '2'
+            description: 'OpenDaylight minor (SR) version number to build'
+        - string:
+            name: VERSION_PATCH
+            default: '0'
+            description: 'OpenDaylight patch version to build'
+        - string:
+            name: RPM_RELEASE
+            default: '1'
+            description: 'RPM version for the given ODL major.minor.patch'
+        - string:
+            name: SYSD_COMMIT
+            default: 'c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed'
+            description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
+        - string:
+            name: CODENAME
+            default: 'Beryllium-SR2'
+            description: 'Elemental codename for the ODL release, including SR if applicable'
+        - string:
+            name: DOWNLOAD_URL
+            default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz'
+            description: 'URL to ODL tarball artifact to repackage into RPM'
+        - string:
+            name: CHANGELOG_DATE
+            default: 'Wed May 11 2016'
+            description: 'Date this RPM was defined'
+        - string:
+            name: CHANGELOG_NAME
+            default: 'Jenkins'
+            description: 'Name of person who defined RPM'
+        - string:
+            name: CHANGELOG_EMAIL
+            default: 'jenkins-donotreply@opendaylight.org'
+            description: 'Email of person who defined RPM'
+
+    scm:
+        - integration-gerrit-scm:
+            basedir: 'packaging'
+            refspec: '$GERRIT_REFSPEC'
+            branch: 'master'
+
+    builders:
+        - shell: !include-raw: include-raw-build-rpm.sh
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index bbb2cb240..7bd3a04e7 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -385,5 +385,7 @@
         - ssh-agent-credentials:
             users:
                 - 'opendaylight-jenkins-ssh'
+        - jclouds:
+            single-use: True
         - openstack:
             single-use: True
diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 257a9a3cf..71e8bc548 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -195,7 +195,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: '{mvn-settings}'
@@ -716,7 +716,7 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{project-name}-verify-{stream}-{maven}-{jdk}'
+    name: '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     # Job template for ODL verify jobs
     #
@@ -729,7 +729,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{jdks}'
 
     logrotate:
         daysToKeep: '7'
diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
deleted file mode 100644
index 378943f99..000000000
--- a/jjb/yangtools/yangtools-verify.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-- project:
-    name: yangtools-verify-boron
-    jobs:
-        - 'yangtools-verify-{stream}-{maven}-{jdk}'
-
-    jdk:
-        - openjdk8
-
-    # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
-    maven:
-        - mvn32:
-            mvnver: '{mvn32}'
-        - mvn33:
-            mvnver: '{mvn33}'
-
-    stream:
-        - boron:
-            branch: master
-
-    project: 'yangtools'
-
-- project:
-    name: yangtools-verify-beryllium
-    jobs:
-        - 'yangtools-verify-{stream}-{maven}-{jdk}'
-
-    jdk:
-        - openjdk7
-        - openjdk8
-
-    # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
-    maven:
-        - mvn32:
-            mvnver: '{mvn32}'
-        - mvn33:
-            mvnver: '{mvn33}'
-
-    stream:
-        - beryllium:
-            branch: stable/beryllium
-
-    project: 'yangtools'
-
-- project:
-    name: yangtools-verify-lithium
-    jobs:
-        - 'yangtools-verify-{stream}-{maven}-{jdk}'
-
-    jdk:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn31:
-            mvnver: '{mvn31}'
-        - mvn32:
-            mvnver: '{mvn32}'
-
-    stream:
-        - stable-lithium:
-            branch: stable/lithium
-
-    project: 'yangtools'
-
-- job-template:
-    name: 'yangtools-verify-{stream}-{maven}-{jdk}'
-
-    project-type: maven
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-
-    scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'yangtools'
-            branch: '{branch}'
-
-    prebuilders:
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'yangtools-settings'
-
-    maven:
-        maven-name: '{mvnver}'
-        root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'yangtools-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        ignore-upstream-changes: true
-
-    publishers:
-        - email-notification:
-            email-prefix: '[yangtools]'
diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 6c70e74b4..87a140415 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,6 +1,6 @@
 # ODL Releng build templates
 - project:
-    name: yangtools
+    name: yangtools-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,41 +8,114 @@
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
         - '{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:
         - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
+
+    project: 'yangtools'
+    project-name: 'yangtools'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn32:
+            mvn-version: '{mvn32}'
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'yangtools-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: 'odlparent-merge-{stream}'
+    email-upstream: '[yangtools] [odlparent]'
+    archive-artifacts: ''
+
+- project:
+    name: yangtools-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: 'yangtools'
+    project-name: 'yangtools'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+      - openjdk7
+      - openjdk8
+    maven:
+        - mvn32:
+            mvn-version: '{mvn32}'
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'yangtools-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: 'odlparent-merge-{stream}'
+    email-upstream: '[yangtools] [odlparent]'
+    archive-artifacts: ''
+
+- project:
+    name: yangtools-stable-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: 'yangtools'
     project-name: 'yangtools'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn31:
+            mvn-version: '{mvn31}'
+        - mvn32:
+            mvn-version: '{mvn32}'
     mvn-settings: 'yangtools-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: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
+
+- project:
+    name: yangtools-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'yangtools'
+    project-name: 'yangtools'
+    branch: 'master'
+    mvn-settings: 'yangtools-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/packer/README.markdown b/packer/README.markdown
index fef4cea34..f02ace5e9 100644
--- a/packer/README.markdown
+++ b/packer/README.markdown
@@ -15,7 +15,7 @@ specific build, combine the template for the desired output artifact type with
 a variable file. To build a new java-builder instance the following would be done:
 
 ```
-packer build -var-file=vars/cloud-env.json -var-file/centos.json templates/java-builder.json
+packer build -var-file=vars/cloud-env.json -var-file=vars/centos.json templates/java-builder.json
 ```
 
 **NOTE:** vars/cloud-env.json is a gitignored file as it contains private
diff --git a/packer/provision/robot.sh b/packer/provision/robot.sh
index 441b01047..19aee1828 100644
--- a/packer/provision/robot.sh
+++ b/packer/provision/robot.sh
@@ -12,7 +12,7 @@ yum install -q -y python-{devel,setuptools,virtualenv} @development
 yum install -y -q yum-utils unzip sshuttle nc libffi-devel openssl-devel
 
 # Install dependencies for matplotlib library used in longevity framework
-yum-builddep -y python-matplotlib
+yum install -y -q libpng-devel freetype-devel python-matplotlib
 
 # install crudini command line tool for editing config files
 yum install -y -q crudini