From 736890fb30490f7749aa82f94064051be5127e5d Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 1 May 2017 17:07:48 -0400 Subject: [PATCH] qa/workunits: fix appdir setup issue in devstack See https://bugs.launchpad.net/devstack/+bug/1667545 Signed-off-by: Jason Dillaman --- qa/workunits/rbd/run_devstack_tempest.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qa/workunits/rbd/run_devstack_tempest.sh b/qa/workunits/rbd/run_devstack_tempest.sh index b3fdc456bce..e0c10882e9e 100755 --- a/qa/workunits/rbd/run_devstack_tempest.sh +++ b/qa/workunits/rbd/run_devstack_tempest.sh @@ -84,8 +84,12 @@ cat< ${STACK_HOME_PATH}/start.sh #!/bin/bash -ex cd ${STACK_OPT_PATH} git clone https://git.openstack.org/openstack-dev/devstack -b ${STACK_BRANCH} -cd devstack +# TODO workaround for https://github.com/pypa/setuptools/issues/951 +git clone https://git.openstack.org/openstack/requirements.git -b ${STACK_BRANCH} +sed -i 's/appdirs===1.4.0/appdirs===1.4.3/' requirements/upper-constraints.txt + +cd devstack cp ${STACK_HOME_PATH}/local.conf . export PYTHONUNBUFFERED=true @@ -94,7 +98,6 @@ export PROJECTS="openstack/devstack-plugin-ceph" ./stack.sh EOF - # execute devstack chmod 0755 ${STACK_HOME_PATH}/start.sh sudo -H -u ${STACK_USER} ${STACK_HOME_PATH}/start.sh -- 2.39.5