X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-openstack-run-test.sh;h=25bd8ecc4c9b199701631bed2a71db639d54254a;hb=8092e6ae3dcc177bcf83402c1c579ba1c2c6c660;hp=5c31cbd61f838a7a5e2fabf2d76a96c29b611647;hpb=acac4a0740887c4f4d81e36b2fa2697bef65580f;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 5c31cbd61..25bd8ecc4 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -3,7 +3,7 @@
 # ${ROBOT_VENV} comes from the integration-install-robotframework.sh
 # script.
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
-source "${ROBOT_VENV}/bin/activate"
+. "${ROBOT_VENV}/bin/activate"
 source /tmp/common-functions.sh "${BUNDLEFOLDER}"
 # Ensure we fail the job if any steps fail.
 set -ex -o pipefail
@@ -96,11 +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 -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"
@@ -108,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
@@ -127,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
 }
@@ -344,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
@@ -769,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
@@ -1133,7 +1148,7 @@ export OS_TENANT_NAME=admin
 unset OS_CLOUD
 EOF
 
-source /tmp/os_netvirt_client_rc
+. /tmp/os_netvirt_client_rc
 
 echo "Get all versions before executing robot"
 echo "openstack --version"
@@ -1162,7 +1177,7 @@ for suite in ${SUITES}; do
     suite_name="$(basename "${suite}" | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
     robot -N "${log_name}" \
-    -c critical -e exclude -e "skip_if_${DISTROSTREAM}" \
+    -e exclude -e "skip_if_${DISTROSTREAM}" \
     --log "log_${log_name}.html" --report "report_${log_name}.html" --output "output_${log_name}.xml" \
     --removekeywords wuks \
     --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \
@@ -1218,6 +1233,7 @@ for suite in ${SUITES}; do
     -v TOOLS_SYSTEM_2_IP:"${TOOLS_SYSTEM_2_IP}" \
     -v TOOLS_SYSTEM_3_IP:"${TOOLS_SYSTEM_3_IP}" \
     -v USER_HOME:"${HOME}" \
+    -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
     -v WORKSPACE:/tmp \
     ${TESTOPTIONS} ${suite} || true
 done