Add OpenStack Ocata runs for netvirt

[releng/builder.git] / jjb / netvirt / netvirt-legacy-csit-multi-openstack.yaml

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index c1644ad969d7d8d61fc9df6c21a5aa2c4894dfcd..e72b2ade41ca51ca913d5315588327b25e5961f9 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -1,70 +1,57 @@
+---
 - project:
     name: netvirt-legacy-csit-openstack-integration
     jobs:
-        - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     # The project name
     project: 'netvirt-legacy'
 
     topology:
-        - 1node:
-            openstack_system_count: 3
-            odl_system_count: 1
-            enable-haproxy: 'no'
-            install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
-        - 3node:
-            openstack_system_count: 4
-            odl_system_count: 3
-            enable-haproxy: 'yes'
-            install-features: 'odl-jolokia,odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+      - 3node:
+          openstack_system_count: 4
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     testplan: '{project}-{topology}-openstack.txt'
 
     # The project name
     functionality:
-        - upstream:
-            schedule: ''
-        - gate:
-            schedule: ''
+      - upstream:
+          schedule: ''
+      - gate:
+          schedule: ''
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
+          karaf-version: karaf3
 
     openstack:
-        - mitaka:
-            openstack-branch: 'stable/mitaka'
-            odl-ml2-branch: 'stable/mitaka'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: CentOS 7 - devstack - mitaka - 20170106-2237
-        - newton:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
-        - newton-nodl-v2:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v2'
-            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
-
-    odl-enable-l3: 'yes'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - newton-nodl-v2:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
     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'
-
-    security-group-mode: 'none'
-
-    robot-options: ''