From 1357cc51ad4f9175f92c3aeaa5780f091d949447 Mon Sep 17 00:00:00 2001 From: gvrangan Date: Tue, 21 Feb 2017 22:42:01 +0000 Subject: [PATCH] Fix the Tempest Tests failure in Mitaka Jobs. The earlier merged fix is causing some failures with Newton jobs. this change will avoid all the problems. Change-Id: If3d87ef196178bf5f30d9afff0f388a60f521c73 Signed-off-by: gvrangan Signed-off-by: Jamo Luhrsen --- ...raw-integration-deploy-openstack-run-test.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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 9429ec372..4e601acf0 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -451,10 +451,20 @@ ${SSH} ${OPENSTACK_CONTROL_NODE_IP} "bash /tmp/get_devstack.sh" create_control_node_local_conf scp ${WORKSPACE}/local.conf_control ${OPENSTACK_CONTROL_NODE_IP}:/opt/stack/devstack/local.conf + +# Workworund for successful stacking with Mitaka if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then -ssh ${OPENSTACK_CONTROL_NODE_IP} "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" -ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo pip install deprecation" -ssh ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack; git clone https://github.com/openstack/python-openstacksdk; cd python-openstacksdk; sudo python setup.py install" + + # 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 ${OPENSTACK_CONTROL_NODE_IP} "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" + ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo pip install deprecation" + ssh ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack; git clone https://github.com/openstack/python-openstacksdk; cd python-openstacksdk; sudo python setup.py install" + ssh ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack; git clone https://github.com/paramiko/paramiko; cd paramiko; git checkout 1.17; sudo python setup.py install" fi ssh ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &" @@ -565,7 +575,6 @@ done ${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo pip install --upgrade pip" ${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo pip install urllib3 --upgrade" ${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo pip install httplib2 --upgrade" -${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo pip install pycrypto==2.6" for i in `seq 1 $((NUM_OPENSTACK_SYSTEM - 1))` do -- 2.36.6