Merge "Add stable/lithium for vtn"

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/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 ea4c81022d753594dcae1c4cdc23f6d6c2189613..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'
 
@@ -277,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:
@@ -299,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/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 eeec7d1354bd48fc9180aefc54d76b977992eb42..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'
 

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-csit-basic-master.yaml b/jjb/iotdm/iotdm-csit-basic-master.yaml
new file mode 100644 (file)
index 0000000..a38788d
--- /dev/null
+++ b/jjb/iotdm/iotdm-csit-basic-master.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: iotdm-csit-basic-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'iotdm'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-iotdm-onem2m'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'iotdm-distribution-{stream}'
\ No newline at end of file

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

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 8509baebe6b42ae46401a45aa9058cd1cf4348b0..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'
 

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index 4c257825ba38f4753331833f1a0a69169ebc2ad1..bc075d8270b2225cd760ab421d779b8a9d132edd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -3,6 +3,8 @@ BRANCHES:
     jdks: openjdk7,openjdk8
 - stable/helium:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7,openjdk8
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate
 #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: yangtools,controller,openflowjava

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 275033cc2f4838cc172ee09d13326cb7934cdc84..2bd0fe166a578f07a513c1782e0d777143b73b69 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -28,6 +28,12 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'openflowplugin'
 

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 e8efb49bb1d830805ecbbdf72639e20cc0aff6ec..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'
 

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 b13b55a30878e25bc899f3ffa03b251e70b262eb..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'
 

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 5d08cb1a51e8fe76eab6b9d86119627a664037bc..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'
 

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 45dc79ebcde122f67558475b05533f8a58dccaa3..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'
 

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 9bc91fc8040b2506882ba2eb84b3c7b45f163840..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'
 

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 5435e178835fc72074a9f8bde03d23a1b2367346..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'
 

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 a51b6175d0db4c9da1c1e4810d3e3e1d27d9d29e..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'
 

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