Fix Openstack (rocky/stein) stacking issues

[releng/builder.git] / jjb / integration / integration-deploy-openstack-run-test.sh

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 52aaac4cb66f6106ee5cef80aa8c7eaa1d4f3205..1dbb1ed7b061e1941f4deab9599bfd0573548081 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -102,12 +102,12 @@ function install_openstack_clients_in_robot_vm() {
        sed -i s/python-openstackclient===3.14.0/python-openstackclient===3.16.3/ /tmp/constraints.txt
        sed -i s/keystoneauth1===3.10.1/keystoneauth1===3.18.0/ /tmp/constraints.txt
        sed -i s/openstacksdk===0.17.3/openstacksdk===0.48.0/ /tmp/constraints.txt
-       sed -i s/os-service-types===1.3.0/os-service-types===1.7.0/ /tmp/constraints.txt
+       sed -ie 's/os-service-types===.*/os-service-types===1.7.0/' /tmp/constraints.txt
        sed -i s/stevedore===1.29.0/stevedore\>=3.0.0/ /tmp/constraints.txt
        #Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18
        sed -i '1 auwsgi===2.0.18' /tmp/constraints.txt
        #Python3 paramiko 2.7.1 has requirement cryptography>=2.5, Updating it to the latest
-       sed -i s/cryptography===2.3/cryptography===2.9.2/ /tmp/constraints.txt
+       sed -ie 's/cryptography===.*/cryptography===2.9.2/' /tmp/constraints.txt
        echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt"
        $PYTHON -m pip install --upgrade --no-deps "${package}" --no-cache-dir -c /tmp/constraints.txt
        echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt"
@@ -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