Merge "Fix yamllint for reservation"

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-1node-openstack.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index e0d300e249cfeba904db7e1681fa9b7f8e5f898c..7a3c9a6e1ed15d7bd3708c490f3ad8bc16fe8438 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -1,37 +1,46 @@
+---
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-        - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     # The project name
     project: 'groupbasedpolicy'
 
+    topology:
+      - 1node:
+          openstack_system_count: 1
+          odl_system_count: 1
+          enable-haproxy: 'no'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
     # The project name
     functionality: 'openstack'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-            install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-            install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-            install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - boron:
+          branch: 'stable/boron'
+          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
+      - mitaka:
+          openstack-branch: 'stable/mitaka'
+          odl-ml2-branch: 'stable/mitaka'
+          odl-ml2-driver-version: 'v1'
+      - liberty:
+          openstack-branch: 'stable/liberty'
+          odl-ml2-branch: 'stable/liberty'
+          odl-ml2-driver-version: 'v1'
 
     schedule: 'H H * * *'
 
@@ -39,10 +48,18 @@
 
     public-bridge: 'br-int'
 
+    public-physical-network: 'physnet1'
+
+    enable-networking-l2gw: 'no'
+
+    disable-odl-l3-service-plugin: 'no'
+
     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'
\ No newline at end of file
+    security-group-mode: 'none'
+
+    robot-options: ''