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 629e420a0164aebf418073ac2cfa84136bd82385..8492746486f644e2e14c706f3e795423682d3ffe 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -1,11 +1,19 @@
 - 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'
 
@@ -33,8 +41,6 @@
             odl-ml2-branch: 'stable/liberty'
             odl-ml2-driver-version: 'v1'
 
-    openstack-vms: 1
-
     schedule: 'H H * * *'
 
     odl-enable-l3: 'yes'