From: Victor Pickard <vpickard@redhat.com>
Date: Thu, 15 Feb 2018 15:52:22 +0000 (-0500)
Subject: Clean L2GW CSIT, use same VMs as NetVirt
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f4562d3df08d66cb3b673616ae83190dcb8d6afe;p=releng%2Fbuilder.git

Clean L2GW CSIT, use same VMs as NetVirt

Some general cleanup, and switch to using same VMs
as NetVirt.

Change-Id: If2c20d17a288f370627b73ccaaa04066fd9fa28c
Signed-off-by: Victor Pickard <vpickard@redhat.com>
---

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index a4143f9aa..2537b1b1d 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -7,6 +7,19 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: '{sg-mode}'
+    odl_system_flavor: v1-performance-8
+    openstack_system_flavor: v1-performance-8
+    openstack_system2_flavor: v1-performance-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
@@ -22,8 +35,6 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
       - upstream-stateful:
           sg-mode: 'stateful'
@@ -51,25 +62,28 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
+    jobs:
+      - inttest-csit-hwvtep-openstack
+
+    project: 'netvirt'
+    stream: 'nitrogen'
+    branch: 'stable/nitrogen'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
+    odl_system_flavor: v1-performance-8
+    openstack_system_flavor: v1-performance-8
+    openstack_system2_flavor: v1-performance-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
 
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
-    jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'nitrogen'
-    branch: 'stable/nitrogen'
-
     topology:
       - 1node:
           openstack_system1_count: 1
@@ -84,11 +98,8 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful:
           schedule: ''
@@ -115,16 +126,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,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-carbon
     jobs:
@@ -135,6 +136,19 @@
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: '{sg-mode}'
+    odl_system_flavor: v1-performance-8
+    openstack_system_flavor: v1-performance-8
+    openstack_system2_flavor: v1-performance-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
@@ -150,11 +164,8 @@
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful:
           schedule: ''
@@ -174,13 +185,3 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'