Merge "Add stable/lithium jobs for openflowplugin"

diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh
index e2f5f13535cdc5bf6dae49d76ff39873d2a6f59e..038e81d83588d087927e8bfec0fd24b52d3d5c68 100755 (executable)
--- a/jenkins-scripts/builder.sh
+++ b/jenkins-scripts/builder.sh
@@ -3,4 +3,16 @@
 yum clean all
 yum install -y python-{tox,virtualenv} xmlstarlet
 
+# add in mono components for VTN
+yum install -y yum-utils
+#The following is needed for the new code in vtn project.
+#these packages will enable C# compilation.
+rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+#Added the mono tools repository
+yum-config-manager -q -y --add-repo http://download.mono-project.com/repo/centos6
+#Install the nuget binary
+yum install -q -y http://download.mono-project.com/repo/centos/RPMS/noarch/nuget-2.8.3+md58+dhx1-0.noarch.rpm
+#install the mono toolchain
+yum -q -y install mono-complete
+
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index cbe6e7422cf03a89afdc0683a027ef8cb0e5ea61..deed83ae9aed8dd519899a289c927eaa77b68095 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -2,10 +2,11 @@
     name: 'PROJECT-integration-{stream}'
     disabled: DISABLED
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 0ae5421b3dea244051d7286014ba1842e913bbee..4eac939c8e27e90ed3b728673f0f06040bac6d73 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -249,10 +249,11 @@
     name: 'aaa-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
index 711182d2eb54908e5a5858ed19050cf026f6e3cb..f398810a6f4871de3c447cc247052f89440ad41b 100644 (file)
--- a/jjb/alto/alto.cfg
+++ b/jjb/alto/alto.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent,bpgcep
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent,l2switch

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 6ba615cef1e2599d072213c88304ebce3c8fbe66..6bf610fe2f3fdcaca6d7bfd0c78194737eaf38d0 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -22,6 +22,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'alto'
 
@@ -239,10 +244,11 @@
     name: 'alto-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
@@ -276,7 +282,7 @@
 
     triggers:
         - reverse:
-            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},bpgcep-merge-{stream}'
+            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},l2switch-merge-{stream}'
             result: 'success'
 
     prebuilders:
@@ -298,7 +304,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[alto] [controller] [yangtools] [odlparent] [bpgcep]'
+            email-prefix: '[alto] [controller] [yangtools] [odlparent] [l2switch]'
         - jacoco-report
 
 - job-template:

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index d7b8325f3b1de7769b49629c169e329f808a649b..4c289c452546d4f4bb8bf260981ea8d3d9b546db 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -64,15 +64,17 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
 
@@ -132,14 +134,16 @@
             autorelease-settings: '{autorelease-settings}'
             odl-global-settings: '{odl-global-settings}'
         - autorelease-maven-deploy
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index c144bbfd5cf89eac8cb07fb398f6b0b657a635e1..1cb313777cc9974bf2a1325fd43a41667c43dae3 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -43,8 +43,13 @@
         - maven-target:
             maven-version: '{maven-version}'
             pom: 'pom.xml'
-            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            goals: 'dependency:sources -DoutputFile=sources.log -DappendOutput -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m'
             settings: '{settings}'
             global-settings: '{global-settings}'
+- builder:
+    name: autorelease-maven-sources-post-process
+    builders:
+        - shell: |
+            awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index cb5df6270d52597610315cb1674e6a46f038584d..f7241d188f73f910d65cf73badb59a66ffceaeee 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -63,14 +63,16 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index bef3204c0d569090a7b3c687494871d6b72e42c5..7fdab6412654923602214a762898cb9650c7d092 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -17,6 +17,11 @@ git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 mkdir patches
-git submodule foreach 'git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$name.patch'
+modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
+for module in $modules; do
+    cd $module
+    git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$module.patch
+    cd ..
+done
 
 ./scripts/fix-relativepaths.sh

diff --git a/jjb/bgpcep/bgpcep-verify.yaml b/jjb/bgpcep/bgpcep-verify.yaml
deleted file mode 100644 (file)
index 0ae4d88..0000000
--- a/jjb/bgpcep/bgpcep-verify.yaml
+++ /dev/null
@@ -1,157 +0,0 @@
-- project:
-    name: bgpcep-verify
-    jobs:
-        - 'bgpcep-verify-{stream}'
-        - 'bgpcep-verify-stable-helium'
-
-
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
-    stream:
-        - master:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
-
-    project: 'bgpcep'
-
-- job-template:
-    name: 'bgpcep-verify-{stream}'
-
-    # Job template for ODL verify jobs
-    #
-    # The purpose of this job template is to setup a ODL verify job
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
-
-    project-type: matrix
-    node: matrix_master
-    concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - dynamic_verify
-        - axis:
-            type: jdk
-            values:
-                - openjdk7
-                - openjdk8
-
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'bgpcep'
-            branch: '{branch}'
-
-    builders:
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{bgpcep-settings}'
-            global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
-
-    publishers:
-        - findbugs
-        - email-notification:
-            email-prefix: '[bgpcep]'
-        - jacoco-report
-
-- job-template:
-    name: 'bgpcep-verify-stable-helium'
-
-    project-type: matrix
-    node: matrix_master
-    concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - dynamic_verify
-        - axis:
-            type: jdk
-            values:
-                - openjdk7
-
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'stable/helium'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'bgpcep'
-            branch: 'stable/helium'
-
-    builders:
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{bgpcep-settings}'
-            global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
-
-    publishers:
-        - findbugs
-        - email-notification:
-            email-prefix: '[bgpcep]'
-        - jacoco-report

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index 1c5f9c62742d175e2b2ba52375784ef0ea484b93..eef55629c6dfc1caa5cf1cab7d083915672f6ac3 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -1,4 +1,3 @@
-JOB_TEMPLATES: merge,daily,integration,sonar
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index aca876c0c7b71dca1d3def1d8b0369e4634ad664..04bd3ad92d4fdfa77d3eb33ad31b3d8cbe58ceb0 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -6,6 +6,7 @@
 - project:
     name: bgpcep
     jobs:
+        - 'bgpcep-verify-{stream}'
         - 'bgpcep-merge-{stream}'
         - 'bgpcep-daily-{stream}'
         - 'bgpcep-integration-{stream}'
@@ -41,6 +42,78 @@
 # MAVEN_GOALS with your maven goals to build
 # MAVEN_OPTS with your maven options to build
 
+- job-template:
+    name: 'bgpcep-verify-{stream}'
+
+    # Job template for ODL verify jobs
+    #
+    # The purpose of this job template is to setup a ODL verify job
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: matrix
+    node: matrix_master
+    concurrent: true
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values: '{obj:jdks}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'bgpcep'
+            branch: '{branch}'
+
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{bgpcep-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - findbugs
+        - email-notification:
+            email-prefix: '[bgpcep]'
+        - jacoco-report
+
 - job-template:
     name: 'bgpcep-merge-{stream}'
 
@@ -178,10 +251,11 @@
     name: 'bgpcep-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index a386872d566a4997921da792f762b32ff6c0e98b..ed6a195efc79a761e192cad4d3b0f3b86f37e19b 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -239,10 +239,11 @@
     name: 'capwap-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/controller/controller-csit-netconf-master.yaml b/jjb/controller/controller-csit-netconf-master.yaml
index 4e5ec925529d60f665478aec350d59f1d598f5a9..98c124ed7245e6a1e51801f8539a7234d9ee9a48 100644 (file)
--- a/jjb/controller/controller-csit-netconf-master.yaml
+++ b/jjb/controller/controller-csit-netconf-master.yaml
@@ -25,7 +25,7 @@
     install-features: 'odl-netconf-connector-all,odl-restconf-all'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v NETOPEER_USER:root'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'

diff --git a/jjb/controller/controller-csit-netconf-stable-helium.yaml b/jjb/controller/controller-csit-netconf-stable-helium.yaml
index f5a60f251382a7f8e077df1e98ce57d0414d6930..190a93e0b2da698b6d2fd0299eff4b1f9a1e2750 100644 (file)
--- a/jjb/controller/controller-csit-netconf-stable-helium.yaml
+++ b/jjb/controller/controller-csit-netconf-stable-helium.yaml
@@ -25,7 +25,7 @@
     install-features: 'odl-netconf-connector-all,odl-restconf-all'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v NETOPEER_USER:root'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index d2380adf9e1265dac64cf1e8f2e277914677337c..31641f8f02514eb7c65b01dad323c865b11be2b0 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -178,10 +178,11 @@
     name: 'controller-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index feac174c8dd35006ec833b0040113adaac0de393..86d1c79f8fec7ad0248a73d70cec525e1feb593e 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -239,10 +239,11 @@
     name: 'coretutorials-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/defense4all/defense4all.cfg b/jjb/defense4all/defense4all.cfg
index c81757526ccf269684ed19d6cc6b321e7dc04dd0..42ddd11be2f71b3edc10d2beb6dbc8f1d6656d40 100644 (file)
--- a/jjb/defense4all/defense4all.cfg
+++ b/jjb/defense4all/defense4all.cfg
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent
 POM: dfapp/pom.xml

diff --git a/jjb/defense4all/defense4all.yaml b/jjb/defense4all/defense4all.yaml
index da1e4d1007662e034c030d13b1c46677e95fad53..eb65471d37b3fdb903d798cc704d5bde3fd6b572 100644 (file)
--- a/jjb/defense4all/defense4all.yaml
+++ b/jjb/defense4all/defense4all.yaml
@@ -27,6 +27,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'defense4all'
 
@@ -244,10 +249,11 @@
     name: 'defense4all-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 13896354fc010a0168ffc2ac10bc78a4de9584e2..3fe1b58d82977b48d869cee5dcc7badcfb41c974 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -239,10 +239,11 @@
     name: 'didm-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 7e9d809f650bb598f3a34f0fe74020f2a288b081..6ddcb60bd91d3edc5062c13492949fb53f8b5f25 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -239,10 +239,11 @@
     name: 'discovery-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index d009cbc0cf8f24650ca55d253f89d244e971eeef..6c5fdfb6c14ea005eeb1e5506d9bfd757900bdd8 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -249,10 +249,11 @@
     name: 'dlux-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index de3a4cc34f42d9219f5d0ddb9a18b8bbea5a94c1..702a9f440df1ffb3f81b63d6d32ca35c59e22f88 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -244,10 +244,11 @@
     name: 'docs-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 9659d1927d91ef3371a9d5b76b89baaae80770d1..6dc2c8dc77347ea7bf013a1e8e5dccc8ee5eceef 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -244,10 +244,11 @@
     name: 'groupbasedpolicy-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

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 60e6d02219d770bea584a1c4740e32e40e7431f9..64af1e084031d0a3b7b5cc2cf6283efb42308315 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -102,7 +102,10 @@ cat testplan.txt
 SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp -v CONTROLLER:${CONTROLLER0} -v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} ${TESTOPTIONS} ${SUITES}
+pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
+-v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${CONTROLLER0} \
+-v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
+# the "|| true" is there to swallow a non-zero error code, as we do not want a failed critical test case to stop this script (run with -xe by Jenkins) from gathering karaf.log
 
 echo "Fetching Karaf log"
 scp ${CONTROLLER0}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log .

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 257fb5c90645d8d240f847c4341cca8d459be7a7..19054f13334b4345a32190145bc092c23fcff22a 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -112,7 +112,8 @@ echo "Starting Robot test suites ${SUITES} ..."
 
 pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
 -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${CONTROLLER0} -v CONTROLLER1:${CONTROLLER1} -v CONTROLLER2:${CONTROLLER2} \
--v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES}
+-v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
+# the "|| true" is there to swallow a non-zero error code, as we do not want a failed critical test case to stop this script (run with -xe by Jenkins) from gathering karaf.log
 
 
 #

diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg
index 76d6ab9dbf72da191d16e14e892eb51a81249872..4bfdf75fa38f806ae519590e49ad24dbc7a2523a 100644 (file)
--- a/jjb/iotdm/iotdm.cfg
+++ b/jjb/iotdm/iotdm.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8
+- stable/lithium:
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent,aaa

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index b11b48f3c796514d7babb5d185944b17b591ae31..f5679f19c1d7893c9438332e524e682e0473db2b 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -23,6 +23,12 @@
             jdks:
                 - openjdk7
                 - openjdk8
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'iotdm'
 
@@ -240,10 +246,11 @@
     name: 'iotdm-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 543261242e0199d7f570235b6db89c358c7bb9d1..ac1c8d352dc5e84c303e7fc7560231376d18b64e 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -249,10 +249,11 @@
     name: 'l2switch-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index cb5cf228ba299c052925fd69d6537cda931ca223..25ed3ce555406c7004666a901620a2d3863444f6 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -239,10 +239,11 @@
     name: 'lacp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 949310abae218554a4b0016794f90eb442516101..c9cee461719a5f519eea34601803feb91d80143a 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -251,10 +251,11 @@
     name: 'lispflowmapping-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg
index a991382c90cae0ac74d770af343588cafa8ab28b..266ef28894404509a76fb149cf394183acaa4a71 100644 (file)
--- a/jjb/neutron/neutron.cfg
+++ b/jjb/neutron/neutron.cfg
@@ -2,3 +2,5 @@ DEPENDENCIES: odlparent
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8
+- stable/lithium:
+    jdks: openjdk7,openjdk8

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index e87ab82953038c51a1bfec6ef2dc6f9b44475949..8d3d25f1f9185676dfe8a650f0b2f9d66fea9e06 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -23,6 +23,12 @@
             jdks:
                 - openjdk7
                 - openjdk8
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'neutron'
 
@@ -240,10 +246,11 @@
     name: 'neutron-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 860623ae108087a8f29aa95bf346cba73d951ddf..2650fb437a231fb2d81589c764fb69bc2ba4c039 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -239,10 +239,11 @@
     name: 'nic-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index ea1e14ca0879fcdd0834cd22ecff7b7d7aee73db..5a47082b421e923a7219cdaea36517711f37df4b 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -249,10 +249,11 @@
     name: 'odlparent-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index c649795c9387d66839191da753d577733f2481c8..83d40aea529c56377255f0712069ca3bc01d5d40 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -251,10 +251,11 @@
     name: 'openflowjava-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 527610dfb0018d568c16195e1fc4d6bbb7e5865c..275033cc2f4838cc172ee09d13326cb7934cdc84 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -246,10 +246,11 @@
     name: 'openflowplugin-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 8b9abc7108f11cf9cdb10595e0062c5809aefac3..b6f2f891648d3b496bf074288b0e1a9ad001127d 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,daily,integration
\ No newline at end of file
+JOB_TEMPLATES: verify,merge,daily,integration

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 49f6be0bfebb68c09d7f5e7136e94fd8ed4196d2..ffdbadaaa56aeb8a663d8710b55b82553ef885fc 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -26,6 +26,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'ovsdb'
 
@@ -243,10 +248,11 @@
     name: 'ovsdb-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg
index dc50acd7ce18c031d977fa5c8c10d3cb4bd40cd2..acc9d69890bec5d8be6ed2de1fa1c76f5f5a9b7f 100644 (file)
--- a/jjb/packetcable/packetcable.cfg
+++ b/jjb/packetcable/packetcable.cfg
@@ -1 +1,8 @@
-DEPENDENCIES: controller,yangtools
\ No newline at end of file
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index bbdae85521fa0c6d4467ff9bff6b17421f7e3435..091861ba95903dfde1bb50c8ed961ba8f5839bf0 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -27,6 +27,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'packetcable'
 
@@ -244,10 +249,11 @@
     name: 'packetcable-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 9cc2b132b91bb4b4e898327e1b70549b09c146c0..3c65ceceacb662c92ccbd681cdd891ffd4480ee3 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -246,10 +246,11 @@
     name: 'persistence-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg
index 32cc814e57492e5e50b8a209a563e417db65d248..cd70ad612d86bc3e9f49fb35eb11f37cf22d82a1 100644 (file)
--- a/jjb/reservation/reservation.cfg
+++ b/jjb/reservation/reservation.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,groupbasedpolicy

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 4693ec45c91c1f127e1834615308a7801d5451f5..e6748f8741a9541f684544532db725299502db30 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -22,6 +22,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'reservation'
 
@@ -239,10 +244,11 @@
     name: 'reservation-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 31e54de3135a3324512e77503de0623c3ff310a4..8939a09e7f918ece706e4864a30ff2164fcf81d7 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -251,10 +251,11 @@
     name: 'sdninterfaceapp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg
index 233383f576d95af038bedce25cb6943656c34595..a1b5f4c1a5da704cab1ab86032bcd91dc0db8b8d 100644 (file)
--- a/jjb/sfc/sfc.cfg
+++ b/jjb/sfc/sfc.cfg
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,openflowplugin,ovsdb,lispflowmapping

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index eb983a610b2c8f8b8d3ce6c7649e847fa9b17664..c9198b02471c8d2fe5b40823fcbf4c564a83abbe 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -27,6 +27,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'sfc'
 
@@ -244,10 +249,11 @@
     name: 'sfc-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 5946ac333ec6d4887ec70aab5ea47ab2cfe36240..7825cdc730b35c2c9c87cf0e72f49428a509958f 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -244,10 +244,11 @@
     name: 'snbi-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index d69376fd31790726d32f9677dcbae284ea60b66c..197dab81808a40012fce87a08399484ccdfe23f7 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -244,10 +244,11 @@
     name: 'snmp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 3fbeb2623edae718391afd321294594b321794e1..de69b86e2e2f1d3285fdb93c4c20dc183f5e46cc 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -244,10 +244,11 @@
     name: 'snmp4sdn-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 7777dd89e7f66f9939da6b215ed23367831adfa0..860e8ef4838082c65cb02c9a14114f53c15d159c 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -244,10 +244,11 @@
     name: 'sxp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index f9e019fbe18ae595fb9724f4debd3f1918b560dd..7cc5864d26c24c362f1c557fadff444d18727db1 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -251,10 +251,11 @@
     name: 'tcpmd5-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index 7f90b1abe508c5ee4f672fc35b0735b08ee52a75..92a9249a226f63c2f204107467971900487d92bf 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -239,10 +239,11 @@
     name: 'toolkit-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 261ec465d90826b8d7c7bfe7def59708a7d68ea6..4112382f486c6a0c383b662369f81a5046b2841c 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -244,10 +244,11 @@
     name: 'topoprocessing-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/tsdr/tsdr-csit-tsdr-master.yaml b/jjb/tsdr/tsdr-csit-tsdr-master.yaml
new file mode 100644 (file)
index 0000000..13b1e7f
--- /dev/null
+++ b/jjb/tsdr/tsdr-csit-tsdr-master.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: tsdr-csit-tsdr-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The functionality under test
+    functionality: 'hbase-datastore'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-tsdr-hbase'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+

diff --git a/jjb/tsdr/tsdr-distribution.yaml b/jjb/tsdr/tsdr-distribution.yaml
new file mode 100644 (file)
index 0000000..952364d
--- /dev/null
+++ b/jjb/tsdr/tsdr-distribution.yaml
@@ -0,0 +1,15 @@
+- project:
+    name: tsdr-distribution
+    jobs:
+        - '{project}-distribution-{stream}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    jdk: 'openjdk7'
+

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
index c31267c8bcc1bb90ed4363108fc61692f939186b..ca41d539926e1750067612345148dd0f791dc702 100644 (file)
--- a/jjb/tsdr/tsdr.cfg
+++ b/jjb/tsdr/tsdr.cfg
@@ -1,5 +1,7 @@
 BRANCHES:
 - master:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index f8f779dd1354fd357127d9d54c370d8b605b5c4d..0ce662b0932cef4bbae6d2e4a1266db49a0ef2d7 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -22,6 +22,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'tsdr'
 
@@ -239,10 +244,11 @@
     name: 'tsdr-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 6bc196830a4feca6c2ba51845a9e4a404386d5b4..3cf1230a3acdd81fc3d1cd9c1a7d75f2b1751f33 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -244,10 +244,11 @@
     name: 'ttp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg
index ba37d734850188746dbf012f3e1e8c87569c9ada..1f570c101d1d3800569454f6ad8494135fc39118 100644 (file)
--- a/jjb/usc/usc.cfg
+++ b/jjb/usc/usc.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index fc9c6d6c3e9e0321ca7cc4a1599871e3d0062a8e..abae771918804e9bec950fc439eeccded955bd6b 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -22,6 +22,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'usc'
 
@@ -239,10 +244,11 @@
     name: 'usc-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
index 95e3361651886b0fb962ce950d77c12de783e387..087f8b39a8a188ed879a3193f2a5d2bd0060fdd2 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent,openflowplugin

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index d94f810c0155eaa75d35653d1b9316dde5012eb9..424b758a82f766ddfa059e1adebaa7996649bb1e 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -22,6 +22,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'vpnservice'
 
@@ -239,10 +244,11 @@
     name: 'vpnservice-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/vtn/vtn-csit-manager-master.yaml b/jjb/vtn/vtn-csit-manager-master.yaml
index df47e0a3590d33167f954203911d936884e855dd..81643c3d92b813c5fce015d85a998b5b9ea87c6b 100644 (file)
--- a/jjb/vtn/vtn-csit-manager-master.yaml
+++ b/jjb/vtn/vtn-csit-manager-master.yaml
@@ -22,7 +22,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-vtn-manager-all'
+    install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 35b83963e10d2a0dbeda3eaf6406bcfd09392109..3333b2956e189508a3742f2adb0441d2b42b4ece 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -245,10 +245,11 @@
     name: 'vtn-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 5c83ff5821d4aa553ee693a0565a6d254c88aee4..1373d6d437719b5b159546aaee807163e13e16f1 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -178,10 +178,11 @@
     name: 'yangtools-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)

diff --git a/vagrant/basic-builder/bootstrap.sh b/vagrant/basic-builder/bootstrap.sh
index a5155fe9b9842e52dd03c0313441c6aa3a846786..c3a2eef2bf8dfc4805af1572147960e74f976239 100644 (file)
--- a/vagrant/basic-builder/bootstrap.sh
+++ b/vagrant/basic-builder/bootstrap.sh
@@ -48,3 +48,15 @@ yum install -q -y glibc-devel.i686 kernel-headers
 # should only really be done on an EL7 (or F18+) system
 yum install -q -y {jansson,libevent,libevent2,libnl,libuuid}-devel \
     python-{devel,virtualenv,setuptools}
+
+#get yum-config-manager
+yum -q -y install yum-utils
+#The following is needed for the new code in vtn project.
+#these packages will enable C# compilation.
+rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+#Added the mono tools repository
+yum-config-manager -q -y --add-repo http://download.mono-project.com/repo/centos6
+#Install the nuget binary
+yum install -q -y http://download.mono-project.com/repo/centos/RPMS/noarch/nuget-2.8.3+md58+dhx1-0.noarch.rpm
+#install the mono toolchain
+yum -q -y install mono-complete