simplify netvirt openstack yaml

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

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index c7ad4fa74a8a58c844da202423f12538e49ee255..1274ad105fe50647774165ffdb13eaaeaa45323a 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -7,6 +7,11 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
@@ -20,21 +25,14 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
@@ -59,11 +57,6 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-
 - project:
     name: netvirt-csit-openstack-integration-nitrogen
     jobs:
@@ -72,6 +65,11 @@
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
@@ -85,21 +83,14 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
@@ -124,11 +115,6 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-
 - project:
     name: netvirt-csit-openstack-integration-carbon
     jobs:
@@ -138,6 +124,11 @@
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
@@ -151,18 +142,12 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
 
     openstack:
@@ -180,17 +165,13 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
@@ -223,5 +204,3 @@
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
-
-    security-group-mode: 'stateful'