From 4291bb3306f0abf9a915dda8f88a602c3e96a1b8 Mon Sep 17 00:00:00 2001 From: gvrangan Date: Fri, 3 Mar 2017 20:11:04 +0000 Subject: [PATCH] Fix the mitaka jobs failing to stack checkout the release version of openstacksdk, as the master branch requires a higher version of pbr, conflicting other packages in mitaka. Change-Id: Idf6d7883af90cd22255082bfdfe6b371b4aab0d4 Signed-off-by: gvrangan --- ...e-raw-integration-deploy-openstack-run-test.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 27b548ead8..0a4c4fd606 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -477,6 +477,15 @@ ${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 +cat > "${WORKSPACE}/manual_install_package.sh" << EOF +cd /opt/stack +git clone "\$1" +cd "\$2" +git checkout "\$3" +sudo python setup.py install + +EOF + # Workworund for successful stacking with Mitaka if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then @@ -488,9 +497,11 @@ if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then # 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" + scp "${WORKSPACE}/manual_install_package.sh" "${OPENSTACK_CONTROL_NODE_IP}:/tmp" 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" + # Fix for recent requirements update in the master branch of the sdk.The section must be replaced with a better fix. + ssh "${OPENSTACK_CONTROL_NODE_IP}" "sh /tmp/manual_install_package.sh https://github.com/openstack/python-openstacksdk python-openstacksdk 0.9.14" + ssh "${OPENSTACK_CONTROL_NODE_IP}" "sh /tmp/manual_install_package.sh https://github.com/paramiko/paramiko paramiko 1.17" fi ssh ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &" -- 2.36.6