X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-openstack-run-test.sh;h=1dbb1ed7b061e1941f4deab9599bfd0573548081;hb=5ed28c3a46b1f40a6ae43fa8853681290689a98d;hp=81afad6b154f82c15f8c9bf7606917fa1646b2e4;hpb=ab6acd153d74dda810d0af97ae3b87250f284f88;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 81afad6b1..1dbb1ed7b 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -96,7 +96,18 @@ function install_openstack_clients_in_robot_vm() {
        echo "Get the current support version of the package ${package}"
        wget "https://raw.githubusercontent.com/openstack/requirements/stable/${openstack_version}/upper-constraints.txt" -O /tmp/constraints.txt 2>/dev/null
        #python openstackclient version in rocky contradicts with version in global-jjb and stops openstackclient installation in rocky. Will be removed based on version change in global-jjb.
-       sed -i s/python-openstackclient===3.16.2/python-openstackclient===3.14.0/ /tmp/constraints.txt
+       $PYTHON -m pip install setuptools===34.4.0
+       $PYTHON -m pip install python-openstackclient===3.16.3
+       sed -i s/osc-lib===1.11.1/osc-lib\>=2.0.0/ /tmp/constraints.txt
+       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 -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 -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"
@@ -104,6 +115,8 @@ function install_openstack_clients_in_robot_vm() {
     done
 
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+        #alembic 1.4.2 is having issues. Updating the package with 1.4.0
+        $PYTHON -m pip install alembic===1.4.0
         #networking-l2gw is not officially available in any release yet. Getting the latest stable version.
         $PYTHON -m pip install networking-l2gw==11.0.0 more-itertools==5.0.0
     fi
@@ -123,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
 }
@@ -145,11 +158,14 @@ EOF
     ssh "${control_ip}" "bash /tmp/setup_live_migration_control.sh"
 }
 
+#Fix for broken requirements versions while bringing up the stack.
 #Fix Problem caused due to new libvirt version in CentOS repo.
 #The libvirt-python 3.10 does not support all the new API exposed
 #This fix will force devstack to use latest libvirt-python
 #from pypi.org (latest version as of 06-Dec-2018)
-function fix_libvirt_python_build() {
+#Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18
+#more info: https://lists.opendaylight.org/g/app-dev/topic/netvirt_jobs_are_failing_with/74897077
+function fix_broken_requirements_versions() {
     local ip=$1
     ${SSH} "${ip}" "
         cd /opt/stack;
@@ -157,6 +173,7 @@ function fix_libvirt_python_build() {
         cd requirements;
         git checkout ${ODL_ML2_BRANCH};
         sed -i s/libvirt-python===3.10.0/libvirt-python===4.10.0/ upper-constraints.txt
+        sed -i '1 auwsgi===2.0.18' upper-constraints.txt
         "
 }
 
@@ -336,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
@@ -761,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
@@ -856,7 +879,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_CONTROL_NODES}"); do
         # but in the meantime do it ourselves
         ssh "${!CONTROLIP}" "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
     fi
-    fix_libvirt_python_build "${!CONTROLIP}"
+    fix_broken_requirements_versions "${!CONTROLIP}"
     echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
     # Workaround: fixing boneheaded polkit issue, to be removed later
     ssh "${!CONTROLIP}" "sudo bash -c 'echo deltarpm=0 >> /etc/yum.conf && yum -y update polkit'"
@@ -915,7 +938,7 @@ for i in $(seq 1 "${NUM_OPENSTACK_COMPUTE_NODES}"); do
         # but in the meantime do it ourselves
         ssh "${!COMPUTEIP}" "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
     fi
-    fix_libvirt_python_build "${!COMPUTEIP}"
+    fix_broken_requirements_versions "${!COMPUTEIP}"
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
     ssh "${!COMPUTEIP}" "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh "${!COMPUTEIP}" "ps -ef | grep stack.sh"
@@ -1178,6 +1201,7 @@ for suite in ${SUITES}; do
     -v NUM_OS_SYSTEM:"${NUM_OPENSTACK_SYSTEM}" \
     -v NUM_TOOLS_SYSTEM:"${NUM_TOOLS_SYSTEM}" \
     -v ODL_SNAT_MODE:"${ODL_SNAT_MODE}" \
+    -v GROUP_ADD_MOD_ENABLED:"${GROUP_ADD_MOD_ENABLED}" \
     -v ODL_STREAM:"${DISTROSTREAM}" \
     -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" \
     -v ODL_SYSTEM_1_IP:"${ODL_SYSTEM_1_IP}" \