Remove mitaka logic from devstack deploy logic

Change-Id: I1bab2c940c6d1aed71c482ad269a19dc61d1d6bb
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index d2b182eab7c12d1fc6ea8195afea8e04d622a133..f26188442a89ed599dd707fe92c7f028626a76ad 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -155,12 +155,6 @@ disable_service q-l3
 PUBLIC_INTERFACE=br100
 EOF
 
-if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
-cat >> ${local_conf_file_name} << EOF
-Q_L3_ENABLED=True
-ODL_L3=${ODL_L3}
-
-EOF
 if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
 cat >> ${local_conf_file_name} << EOF
 [[post-config|\$NEUTRON_CONF]]
@@ -533,20 +527,6 @@ do
     ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh"
     create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
-    if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
-        # Workaround for problems with latest versions/specified versions in requirements of openstack
-        # Openstacksdk,libvirt-python -> the current version does not work with  Mitaka diue to some requirements
-        # conflict and breaks when trying to stack
-        # paramiko -> Problems with tempest tests due to paramiko incompatibility with pycrypto.
-        # the problem has been solved with  version 1.17. If the latest version of paramiko is used, it causes
-        # other timeout problems
-        ssh ${!CONTROLIP} "cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; git checkout stable/mitaka; sed -i /openstacksdk/d upper-constraints.txt; sed -i /libvirt-python/d upper-constraints.txt; sed -i /paramiko/d upper-constraints.txt"
-        scp "${WORKSPACE}/manual_install_package.sh"  "${!CONTROLIP}:/tmp"
-        ssh ${!CONTROLIP} "sudo pip install deprecation"
-        # Fix for recent requirements update  in the  master branch of the sdk.The section must be replaced with a better fix.
-        ssh "${!CONTROLIP}" "sh /tmp/manual_install_package.sh https://github.com/openstack/python-openstacksdk python-openstacksdk 0.9.14"
-        ssh "${!CONTROLIP}" "sh /tmp/manual_install_package.sh https://github.com/paramiko/paramiko paramiko 1.17"
-    fi
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
     ssh ${!CONTROLIP} "ls -lrt /opt/stack/devstack/nohup.out"
@@ -569,9 +549,6 @@ do
     ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh"
     create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
-    if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
-        ssh ${!COMPUTEIP} "cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; git checkout stable/mitaka; sed -i /libvirt-python/d upper-constraints.txt"
-    fi
     ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"
     os_node_list+=(${!COMPUTEIP})