Merge "Update csit to stable/lithium"

diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh
index 038e81d83588d087927e8bfec0fd24b52d3d5c68..967cfe9706591313d1fef275bd6a8167a3892689 100755 (executable)
--- a/jenkins-scripts/builder.sh
+++ b/jenkins-scripts/builder.sh
@@ -9,9 +9,9 @@ yum install -y yum-utils
 #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
+yum-config-manager -q -y --add-repo http://origin-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
+yum install -q -y http://origin-download.mono-project.com/repo/centos/n/nuget/nuget-2.8.3+md58+dhx1-0.noarch.rpm
 #install the mono toolchain
 yum -q -y install mono-complete
 

diff --git a/jenkins-scripts/mininet.sh b/jenkins-scripts/mininet.sh
index 552c40315409ca32c516746ff7256b6254280f5d..0b58d4ae229a143f0776b915568fc1d0441979d6 100755 (executable)
--- a/jenkins-scripts/mininet.sh
+++ b/jenkins-scripts/mininet.sh
@@ -14,7 +14,7 @@ yum install -q -y netopeer-server-sl CPqD-ofsoftswitch13
 # netaddr and ipaddress libraries can be useful on this system as
 # some tests are starting to push pyhon scripts/tools to this VM
 # during CI tests
-yum install -q -y python-{ipaddress,netaddr}
+yum install -q -y python-{ipaddr,iptools,netaddr}
 
 # the vagrant configuration for netopeer doesn't configure SSH correctly
 # as it uses and here document via echo and not cat fix that

diff --git a/jjb/controller/controller-csit-netconf-master.yaml b/jjb/controller/controller-csit-netconf.ymal
similarity index 88%
rename from jjb/controller/controller-csit-netconf-master.yaml
rename to jjb/controller/controller-csit-netconf.ymal
index 98c124ed7245e6a1e51801f8539a7234d9ee9a48..2a0474f1bf03eb3273a3a961400dd314b9c50f25 100644 (file)
--- a/jjb/controller/controller-csit-netconf-master.yaml
+++ b/jjb/controller/controller-csit-netconf.ymal
@@ -1,5 +1,5 @@
 - project:
-    name: controller-csit-netconf-master
+    name: controller-csit-netconf
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
index f2519b9f9ba575f8add9173f1fe8e58abf9d2788..3a1b40530323713670da577eacc31bcfb464e7e8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
@@ -1,3 +1,10 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_GOALS: -U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava,openflowplugin

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index ed1f4696586899b01138d2960a04f24912201ed1..784b56088f24b8832b6f2acdbe75a626ef7473f1 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -28,6 +28,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'groupbasedpolicy'
 

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 23eab114eb1e0ae6d23d3c0e20d24bd38eea7b6e..eb62b19583b6ae3d9674fcbbd46e87cad543ddce 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -1,4 +1,4 @@
-NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
+export NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 CONTROLLERMEM="2048m"
 
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
@@ -11,20 +11,20 @@ fi
 if [ ${BUNDLEURL} == 'last' ]; then
     NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
     # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
+    export BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
     # Acquire the timestamp information from maven-metadata.xml
     wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
     TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
     echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-    BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
-    ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+    export BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
+    export BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
+    export ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
 else
-    ACTUALBUNDLEURL="${BUNDLEURL}"
-    BUNDLE="${BUNDLEURL##*/}"
-    BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
+    export ACTUALBUNDLEURL="${BUNDLEURL}"
+    export BUNDLE="${BUNDLEURL##*/}"
+    export BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
+    export BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
 fi
 
 echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
@@ -33,6 +33,17 @@ echo "Distribution bundle version is ${BUNDLEVERSION}"
 echo "Distribution folder is ${BUNDLEFOLDER}"
 echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 
+if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
+    echo "scriptplan exists!!!"
+    echo "Changing the scriptplan path..."
+    cat ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > scriptplan.txt
+    cat scriptplan.txt
+    for line in $( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' scriptplan.txt ); do
+        echo "Executing ${line}..."
+        source ${line}
+    done
+fi
+
 cat > ${WORKSPACE}/controller-script.sh <<EOF
 
 echo "Changing to /tmp"

diff --git a/jjb/iotdm/iotdm-csit-basic-master.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
similarity index 81%
rename from jjb/iotdm/iotdm-csit-basic-master.yaml
rename to jjb/iotdm/iotdm-csit-basic.yaml
index a38788d7e1fcb0d06b1eb383f06fcff94655960b..d72e8f2a2fcc8136e68e85c18d969534e3f1cd5b 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic-master.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: iotdm-csit-basic-master
+    name: iotdm-csit-basic
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
@@ -28,4 +30,4 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'iotdm-distribution-{stream}'
\ No newline at end of file
+    trigger-jobs: 'iotdm-distribution-{stream}'

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
similarity index 87%
rename from jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml
rename to jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index e666679147bf54905a727354ce80ececcdf0ef89..d051cbbaf748f478f66afdb9d46c079f098376bb 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-host-scalability-daily-master
+    name: l2switch-csit-host-scalability-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability-master.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
similarity index 89%
rename from jjb/l2switch/l2switch-csit-scalability-master.yaml
rename to jjb/l2switch/l2switch-csit-scalability.yaml
index d58bb630a94edc4e26c7f875ecefe0bc2458739c..6319e6d4ef037ecb3f5fefddd76e9dd279a91a73 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability-master.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-scalability-master
+    name: l2switch-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-switch-master.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
similarity index 89%
rename from jjb/l2switch/l2switch-csit-switch-master.yaml
rename to jjb/l2switch/l2switch-csit-switch.yaml
index 8de156ee3bdfcd59393c47c1bbefec4771002b10..0b162eedaeb2ce617291bd52f157383862554bd2 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch-master.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-switch-master
+    name: l2switch-csit-switch
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all.yaml
similarity index 89%
rename from jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
rename to jjb/lispflowmapping/lispflowmapping-csit-all.yaml
index 535a8126a3612865953f976da5e8741c22d48f1e..11545965b2ddea84bc76d82273652aaf6c2348c1 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: lispflowmapping-csit-all-master
+    name: lispflowmapping-csit-all
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
similarity index 89%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index b44a1f45d3ee956c2156e4096e3a58bbbcd934d4..af4f6ceb50129085e50e0a0cf2c0c54802d137ea 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-daily-master
+    name: openflowplugin-csit-cbench-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
similarity index 90%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index d9afacbf63cef0598c8173ed046100be728a5fcd..f8ad74192869134d0eea2114704d3d9a4222d6ac 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-performance-master
+    name: openflowplugin-csit-cbench-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index 97629e639ff3ce311258e4925a62a1d7dd0fff68..2b0284ab07b08d4d8b054fc091ebf445923d5df3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-config-performance-master
+    name: openflowplugin-csit-config-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
similarity index 81%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
index 986c54e9b26c02bf525ef58e744f1045da6af32c..5395c553e89c7ce7ca38e005f3c021b9bf66f315 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
@@ -1,7 +1,8 @@
 - project:
-    name: openflowplugin-csit-flow-services-more-master
+    name: openflowplugin-csit-flow-services-more
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -13,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 0701f1424a7630b01c17476b9e958299b9c9c7a9..9f2539ee8e5ffd501a0a3d6f465c9c8c5d67b0c4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-master
+    name: openflowplugin-csit-flow-services
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
similarity index 87%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 9ba223c3c2d40db5e39297c5e1ade186ce6250df..bc8d2de8a0c4d78be600d9a42b63800ba987bf10 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-daily-master
+    name: openflowplugin-csit-scalability-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index d28c8aa6865599d05919b14da56ec54a72b75bcc..664e6fe217e6d53143e506acaa66c36d77c0189c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-master
+    name: openflowplugin-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/snmp/snmp-csit-basic-master.yaml b/jjb/snmp/snmp-csit-basic.yaml
similarity index 89%
rename from jjb/snmp/snmp-csit-basic-master.yaml
rename to jjb/snmp/snmp-csit-basic.yaml
index 55af9c38cd92ee0e887d27d1b0e2b1fffc8eb2c7..d43e3a311da1b04f3aaa51cf9384075a17d4a223 100644 (file)
--- a/jjb/snmp/snmp-csit-basic-master.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: snmp-csit-basic-master
+    name: snmp-csit-basic
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg
index 515c4955fb131aa45be2c8157ffa8911709e1526..d0fc3da0e45baf9e8d89e1e44a41bec8c9707b0a 100644 (file)
--- a/jjb/sxp/sxp.cfg
+++ b/jjb/sxp/sxp.cfg
@@ -3,6 +3,8 @@ BRANCHES:
     jdks: openjdk7
 - stable/helium:
     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
 DEPENDENCIES: odlparent,controller,yangtools,tcpmd5

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index c25c04fd10b30a1042be9fb88dfe81c2210fb2f6..b5d29fb5889846b4de85989e27c844a79f48524e 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -28,6 +28,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'sxp'
 

diff --git a/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml b/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml
new file mode 100644 (file)
index 0000000..0f7db08
--- /dev/null
+++ b/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: tsdr-csit-tsdr-h2
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The functionality under test to verify
+    functionality: 'h2-datastore'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-tsdr-all'
+
+    # 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-csit-tsdr-master.yaml b/jjb/tsdr/tsdr-csit-tsdr.yaml
similarity index 90%
rename from jjb/tsdr/tsdr-csit-tsdr-master.yaml
rename to jjb/tsdr/tsdr-csit-tsdr.yaml
index 6b31940e2238c4a9c14d30a79b12e116d9193347..93f2f3b5e381ccdd99c7fe8656ed0720e435826e 100644 (file)
--- a/jjb/tsdr/tsdr-csit-tsdr-master.yaml
+++ b/jjb/tsdr/tsdr-csit-tsdr.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: tsdr-csit-tsdr-master
+    name: tsdr-csit-tsdr
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/usc/usc-csit-channel-master.yaml b/jjb/usc/usc-csit-channel.yaml
similarity index 89%
rename from jjb/usc/usc-csit-channel-master.yaml
rename to jjb/usc/usc-csit-channel.yaml
index 9ceeeabc2cdb859059237f0f0baf6b54043d83fd..89b907b50dc84836c027f52dd2561d6299acad69 100644 (file)
--- a/jjb/usc/usc-csit-channel-master.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: usc-csit-channel-master
+    name: usc-csit-channel
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
similarity index 88%
rename from jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml
rename to jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index c92e5d4edbcd38878f723814848ef19f4922ca3f..db226cd245b828a999b5e13d56f23400a7f59ccb 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: vpnservice-csit-vpnservice-master
+    name: vpnservice-csit-vpnservice
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-manager-master.yaml b/jjb/vtn/vtn-csit-manager.yaml
similarity index 90%
rename from jjb/vtn/vtn-csit-manager-master.yaml
rename to jjb/vtn/vtn-csit-manager.yaml
index 81643c3d92b813c5fce015d85a998b5b9ea87c6b..b12b79106c2a3fb608d665a6f403fbba462c651d 100644 (file)
--- a/jjb/vtn/vtn-csit-manager-master.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: vtn-csit-manager-master
+    name: vtn-csit-manager
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/vagrant/basic-builder/bootstrap.sh b/vagrant/basic-builder/bootstrap.sh
index 24aed3c7b54cfa8de03aafce71afe7037d08a3e0..db5f639028e17b56ce86af889f91a1749003da48 100644 (file)
--- a/vagrant/basic-builder/bootstrap.sh
+++ b/vagrant/basic-builder/bootstrap.sh
@@ -30,8 +30,8 @@ yum install -q -y {jansson,libevent,libnl,libuuid}-devel \
 #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
+yum-config-manager -q -y --add-repo http://origin-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
+yum install -q -y http://origin-download.mono-project.com/repo/centos/n/nuget/nuget-2.8.3+md58+dhx1-0.noarch.rpm
 #install the mono toolchain
 yum -q -y install mono-complete

diff --git a/vagrant/basic-mininet-fedora-node/bootstrap.sh b/vagrant/basic-mininet-fedora-node/bootstrap.sh
index fcf24589bba798c047ab84b149882ad1ed0e982f..7da8761c9da8ef44b0ef3da3dcdffc2043396ab9 100644 (file)
--- a/vagrant/basic-mininet-fedora-node/bootstrap.sh
+++ b/vagrant/basic-mininet-fedora-node/bootstrap.sh
@@ -6,6 +6,12 @@
 yum clean all
 yum update -q -y
 
+# install openvswitch
+yum install -q -y openvswitch
+# make sure it's enabled on system start, no need to start it
+# during setup
+systemctl enable openvswitch
+
 # install mininet
 git clone git://github.com/mininet/mininet
 cd mininet