From 5ed28c3a46b1f40a6ae43fa8853681290689a98d Mon Sep 17 00:00:00 2001
From: Venkatrangan Govindarajan <gvrangan@gmail.com>
Date: Tue, 8 Sep 2020 12:07:06 +0530
Subject: [PATCH] Fix Openstack (rocky/stein) stacking issues

- pip update is done.
- Also more cpu resources needed as more instances are created
- Rocky seems to work fine.
- Stein has some compute issues that needs debugging.

Signed-off-by: Venkatrangan Govindarajan <gvrangan@gmail.com>
Change-Id: I3154632d476dfe351d680dd16f8fd8936652b42f
---
 .../integration-deploy-openstack-run-test.sh      | 10 ++++++++--
 jjb/netvirt/netvirt-csit-multi-openstack.yaml     | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index d44b4b3f9..1dbb1ed7b 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -136,8 +136,8 @@ function install_rdo_release() {
           ${SSH} "${ip}" "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
           ;;
 
-       master)
-          ${SSH} "${ip}" "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-rocky/rdo-release-rocky-1.noarch.rpm"
+       *stein*)
+          ${SSH} "${ip}" "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-stein/rdo-release-stein-3.noarch.rpm"
           ;;
     esac
 }
@@ -353,6 +353,8 @@ minimize_polling=True
 # MTU(1400) + VXLAN(50) + VLAN(4) = 1454 < MTU eth0/br-physnet1(1458)
 physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400
 path_mtu = 1458
+[ml2_type_vlan]
+network_vlan_ranges=${PUBLIC_PHYSICAL_NETWORK}:1:4094
 EOF
     if [ "${ENABLE_GRE_TYPE_DRIVERS}" == "yes" ]; then
         cat >> "${local_conf_file_name}" << EOF
@@ -778,6 +780,10 @@ echo
 echo "workaround: do not upgrade openvswitch"
 sudo yum install -y yum-plugin-versionlock
 sudo yum versionlock add openvswitch
+
+echo "workaround: upgrade pip and setuptools"
+sudo pip install --upgrade pip
+sudo pip install --upgrade setuptools
 EOF
 
 cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index b4262e377..aa99daf99 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -15,7 +15,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -86,7 +86,8 @@
     name: netvirt-csit-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-openstack-custom
-
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     stream: "silicon"
     branch: "master"
@@ -181,7 +182,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -253,6 +254,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     stream: "aluminium"
     branch: "stable/aluminium"
@@ -336,6 +339,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     stream: "magnesium"
     branch: "stable/magnesium"
@@ -757,6 +762,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"
@@ -836,6 +843,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"
-- 
2.36.6