Merge "Removed tsdr-cassandra-all* job"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index b66f9e9dbafed197ab2bbfc06a71989a9b8b5f6e..ba4cd6c7e69528eeeee30e758d9e62626dfc88ff 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -55,9 +55,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
similarity index 91%
rename from jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
rename to jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 948b809ce1a03e4d2fbaedc4c3626f254ea11b5b..203de7d1f89e5abe33860da65dcbc2bad9a9b3b5 100644 (file)
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -1,14 +1,14 @@
 - project:
-    name: mdsal-csit-periodic-dsbenchmark-beryllium
+    name: mdsal-csit-periodic-dsbenchmark
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
         - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
-    project: 'mdsal'
+    project: 'controller'
 
     # The functionality under test
-    functionality: 'dsbenchmark'
+    functionality: 'benchmark'
 
     # Project branches
     stream:

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 3361d86d970e4a27bcb7804a762f483a785fb615..ad0b1eca55b3e6835a4ab4122750b2561985c27f 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -93,7 +93,7 @@ fi
 # if we are using the old netvirt impl, as determined by the feature name
 # odl-ovsdb-openstack (note: new impl is odl-netvirt-openstack) then we
 # want ODL_L3 to be True.  New impl wants it False
-if [[ ${CONTROLLERFEATURES}} == *"odl-ovsdb-openstack"* ]]; then
+if [[ ${CONTROLLERFEATURES} == *"odl-ovsdb-openstack"* ]]; then
   ODL_L3=True
 else
   ODL_L3=False
@@ -203,7 +203,7 @@ if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
 cat >> ${local_conf_file_name} << EOF
 # Uncomment lines below if odl-compute is to be used for l3 forwarding
 Q_L3_ENABLED=True
-ODL_L3=True
+ODL_L3=${ODL_L3}
 PUBLIC_INTERFACE=br100
 EOF
 fi

diff --git a/jjb/netvirt/include-setup-controllerIp.sh b/jjb/netvirt/include-setup-controllerIp.sh
new file mode 100644 (file)
index 0000000..ed73ec2
--- /dev/null
+++ b/jjb/netvirt/include-setup-controllerIp.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+echo "---> Setting up controller IP"
+CONTROLLER_IP=`facter ipaddress`
+echo "CONTROLLER_IP=${CONTROLLER_IP}" > env.properties

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index a5c7096fb2a380d4d0cff8c94934d2f82909824e..7b5631f27f0d1fc1ba033765992ed0f5d5569df0 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -26,7 +26,7 @@
     archive-artifacts: '*.log'
 
 - builder:
-    name: netvirt-run-it
+    name: netvirt-run-it-external-docker
     builders:
         - maven-target:
             maven-version: '{maven-version}'
@@ -46,24 +46,55 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
 
+- builder:
+    name: netvirt-run-it-dockerOvs
+    builders:
+        - install-docker-compose
+        - maven-target:
+            maven-version: '{maven-version}'
+            pom: '{pomFile}'
+            goals: '-V -B verify -l {logfile} -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Ddocker.compose.file=ovs-{OVS_VERSION}-hwvtep.yml -Ddocker.vEnvWs=$WORKSPACE -Dsgm=transparent'
+            properties:
+                - 'ovsdb.userspace.enabled=yes'
+                - 'maven.repo.local=/tmp/r'
+                - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
+                - 'stream={stream}'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: 'netvirt-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
 - builder:
     name: run-net-virt-it
     builders:
-        - netvirt-run-it:
+        - netvirt-run-it-dockerOvs:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'openstack/net-virt-it/pom.xml'
             logfile: '{OVS_VERSION}-net-virt-IT.log'
+            OVS_VERSION: '{OVS_VERSION}'
 
 - builder:
     name: run-netvirt-sfc-it
     builders:
-        - netvirt-run-it:
+        - netvirt-run-it-external-docker:
             maven-version: '{maven-version}'
             stream: '{stream}'
             pomFile: 'openstack/net-virt-sfc/it/pom.xml'
             logfile: '{OVS_VERSION}-netvirt-sfc-IT.log'
 
+- builder:
+    name: run-netvirt-vpnservice-it
+    builders:
+        - netvirt-run-it-dockerOvs:
+            maven-version: '{maven-version}'
+            stream: '{stream}'
+            pomFile: 'vpnservice/it/pom.xml'
+            logfile: '{OVS_VERSION}-netvirt-vpnservice-IT.log'
+            OVS_VERSION: '{OVS_VERSION}'
+
 - builder:
     name: install-docker-compose
     builders:
@@ -73,51 +104,30 @@
             pip install --upgrade pip
             pip install docker-compose
 
-- builder:
-    name: deactivate-docker-compose
-    builders:
-        - shell: |
-            $WORKSPACE/venv/bin/deactivate
-
-- builder:
-    name: run-netvirt-vpnservice-it
-    builders:
-        - install-docker-compose
-        - maven-target:
-            maven-version: '{maven-version}'
-            pom: 'vpnservice/it/pom.xml'
-            goals: '-V -B verify -l {OVS_VERSION}-netvirt-vpnservice-IT.log -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Ddocker.compose.file=ovs-{OVS_VERSION}-hwvtep.yml -Ddocker.vEnvWs=$WORKSPACE'
-            properties:
-                - 'ovsdb.userspace.enabled=yes'
-                - 'maven.repo.local=/tmp/r'
-                - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
-                - 'stream={stream}'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: 'netvirt-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - deactivate-docker-compose
 
 - builder:
     name: run-netvirt-it
     builders:
         - inject:
             properties-content: OVS_VERSION={OVS_VERSION}
+        - shell:
+            !include-raw-escape:
+                - include-setup-controllerIp.sh
+        - inject:
+            properties-file: env.properties
         - run-netvirt-vpnservice-it:
             OVS_VERSION: '{OVS_VERSION}'
             maven-version: '{maven-version}'
             stream: '{stream}'
+        - run-net-virt-it:
+            OVS_VERSION: '{OVS_VERSION}'
+            maven-version: '{maven-version}'
+            stream: '{stream}'
         - shell:
             !include-raw-escape:
                 - include-raw-setup-docker.sh
         - inject:
             properties-file: env.properties
-        - run-net-virt-it:
-            OVS_VERSION: '{OVS_VERSION}'
-            maven-version: '{maven-version}'
-            stream: '{stream}'
         - run-netvirt-sfc-it:
             OVS_VERSION: '{OVS_VERSION}'
             maven-version: '{maven-version}'
@@ -196,10 +206,11 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-        - run-netvirt-it:
-            maven-version: '{mvn33}'
-            stream: '{stream}'
-            OVS_VERSION: '2.4.0'
+        #  skip 2.4.0 until we figure out conntrack
+        #- run-netvirt-it:
+        #    maven-version: '{mvn33}'
+        #    stream: '{stream}'
+        #    OVS_VERSION: '2.4.0'
         - run-netvirt-it:
             maven-version: '{mvn33}'
             stream: '{stream}'