From 63cdf079b102a0b575ab760435130e23cdbc0db5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 13 Jan 2017 14:18:32 -0600 Subject: Use git+file urls instead of directories The /opt/stack/new directories are owned by the wrong user, so python setup.py egg_info fails because it can't create the egg_info dir. Changing the invocation to use git+file:// urls solves the problem. Additionally, make a correction to test collection. Change-Id: I39da0b26417dce1a72b15dedc02d10284329307f --- openstackclient/tests/functional/post_test_hook_tips.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'openstackclient/tests') diff --git a/openstackclient/tests/functional/post_test_hook_tips.sh b/openstackclient/tests/functional/post_test_hook_tips.sh index 994142d8..28ab9580 100755 --- a/openstackclient/tests/functional/post_test_hook_tips.sh +++ b/openstackclient/tests/functional/post_test_hook_tips.sh @@ -7,13 +7,14 @@ # http://docs.openstack.org/developer/python-openstackclient/ # This particular script differs from the normal post_test_hook because -# it installs the master (tip) version of osc-lib and openstacksdk +# it installs the master (tip) version of osc-lib, os-client-config +# and openstacksdk, OSCs most important dependencies. function generate_testr_results { if [ -f .testrepository/0 ]; then - sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit + sudo .tox/functional-tips/bin/testr last --subunit > $WORKSPACE/testrepository.subunit sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit - sudo .tox/functional/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html + sudo .tox/functional-tips/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html sudo gzip -9 $BASE/logs/testrepository.subunit sudo gzip -9 $BASE/logs/testr_results.html sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz @@ -28,7 +29,7 @@ sudo chown -R jenkins:stack $OPENSTACKCLIENT_DIR cd $OPENSTACKCLIENT_DIR # Run tests -echo "Running openstackclient functional test suite" +echo "Running openstackclient functional-tips test suite" set +e # Source environment variables to kick things off -- cgit v1.2.1