Merge "Public bridge specification for openstack 1node jobs"

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
new file mode 100644 (file)
index 0000000..107ab5a
--- /dev/null
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -0,0 +1,42 @@
+- project:
+    name: groupbasedpolicy-csit-openstack-integration
+    jobs:
+        - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
+
+    # The project name
+    project: 'groupbasedpolicy'
+
+    # The project name
+    functionality: 'openstack'
+
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+            install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+            install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
+
+    openstack:
+        - mitaka:
+            openstack-branch: 'stable/mitaka'
+            odl-ml2-version:  'stable/mitaka'
+        - liberty:
+            openstack-branch: 'stable/liberty'
+            odl-ml2-version:  'stable/liberty'
+
+    openstack-vms: 1
+
+    schedule: 'H H * * *'
+
+    odl-enable-l3: 'yes'
+
+    public-bridge: 'br-int'
+
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+
+    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
+
+    tenant-network-type: 'vxlan'

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 6fdc6ebec24cffd58d900a974ed4a81b767c4c8a..ce128be455e23d2874facf250b1a5970ec1ddde3 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -91,7 +91,8 @@ fi
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
 cat >> ${local_conf_file_name} << EOF
 
-ODL_PROVIDER_MAPPINGS=br-ex:br100
+PUBLIC_BRIDGE=${PUBLIC_BRIDGE}
+ODL_PROVIDER_MAPPINGS=${PUBLIC_BRIDGE}:br100
 
 disable_service q-l3
 Q_L3_ENABLED=True

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index cb15a657e1d72969d677a69e2185fa658d6cbaf9..ce39d849c2a906cb7ab8750f9c434664b7b9ccd3 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -688,6 +688,10 @@
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
             description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: PUBLIC_BRIDGE
+            default: '{public-bridge}'
+            description: 'Specifies public bridge for provider and external networking'
         - string:
             name: ENABLE_OS_SERVICES
             default: '{enable-openstack-services}'

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index a04d7fdeb1334965e52b88aca3f7569dc4552440..05b2c12b278fca9cd11a3a8d0d169f3dbbbb97c5 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -33,6 +33,8 @@
 
     odl-enable-l3: 'yes'
 
+    public-bridge: 'br-ex'
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
index 73a3b271c92973bb46dc2df11ea755caefd26bbe..53cf4584a05c5e076727167059e98613b3d7a675 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
@@ -30,6 +30,8 @@
 
     odl-enable-l3: 'yes'
 
+    public-bridge: 'br-ex'
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 4363b94022680a504c7baab697bd030eddb35b19..8f0409884635720521d03cee2e18af514a07d735 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -33,6 +33,8 @@
 
     odl-enable-l3: 'no'
 
+    public-bridge: 'br-ex'
+
     enable-openstack-services: 'n-cpu,q-agt,q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'n-net,q-l3'