Added netvirt-vpnservice-3node-openstack-integration

Change-Id: If250e55bac74f449a0ba74761b28422b6f4cfcbb
Signed-off-by: Ravit Peretz <ravit.peretz@hpe.com>
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index ce39d849c2a906cb7ab8750f9c434664b7b9ccd3..93c8c9b2c3f8fdb4dd3c2bd1d55a16fd9ff445e2 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -797,6 +797,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_HAPROXY_FOR_NEUTRON
             default: '{enable-haproxy}'

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index 92f393df99517e1db793b7286d767e2489e2667d..2b95b75add1b37a41c48a93ce7c28007ab3fdf50 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -35,6 +35,8 @@
 
     enable-haproxy: '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-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
new file mode 100644 (file)
index 0000000..f06abf4
--- /dev/null
+++ b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
@@ -0,0 +1,41 @@
+- project:
+    name: netvirt-vpnservice-3node-csit-openstack-integration
+    jobs:
+        - '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
+
+    # The project name
+    project: 'netvirt-vpnservice'
+
+    # The project name
+    functionality: 'openstack'
+
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    openstack:
+        - mitaka:
+            openstack-branch: 'stable/mitaka'
+            odl-ml2-version:  'stable/mitaka'
+        - liberty:
+            openstack-branch: 'stable/liberty'
+            odl-ml2-version:  'stable/liberty'
+
+    openstack-vms: 4
+
+    install-features: 'odl-netvirt-openstack'
+
+    schedule: 'H H * * *'
+
+    odl-enable-l3: 'yes'
+
+    enable-haproxy: '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'
+
+    tenant-network-type: 'vxlan'