Improve if statements with case statements

[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 107ab5ade8d53c79315d095022ce79ab6b0eea8e..8492746486f644e2e14c706f3e795423682d3ffe 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -1,19 +1,31 @@
 - 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:
-        - boron:
+        - 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'
@@ -22,12 +34,12 @@
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'stable/mitaka'
+            odl-ml2-branch: 'stable/mitaka'
+            odl-ml2-driver-version: 'v1'
         - liberty:
             openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
-
-    openstack-vms: 1
+            odl-ml2-branch: 'stable/liberty'
+            odl-ml2-driver-version: 'v1'
 
     schedule: 'H H * * *'
 
@@ -40,3 +52,7 @@
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: 'none'
+
+    robot-options: ''