openstack/python-openstackclient
Code Issues Proposed changes

Use git+file urls instead of directories

Browse Source 
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
This commit is contained in:
Monty Taylor
2017-01-13 14:18:32 -06:00
committed by Steve Martinelli
parent f8e2cf80a1
commit 63cdf079b1
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstackclient/tests/functional/post_test_hook_tips.sh
View File

@@ -7,13 +7,14 @@
# http://docs.openstack.org/developer/python-openstackclient/ # http://docs.openstack.org/developer/python-openstackclient/
# This particular script differs from the normal post_test_hook because # 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 { function generate_testr_results {
if [ -f .testrepository/0 ]; then 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 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/testrepository.subunit
sudo gzip -9 $BASE/logs/testr_results.html sudo gzip -9 $BASE/logs/testr_results.html
sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz 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 cd $OPENSTACKCLIENT_DIR
# Run tests # Run tests
echo "Running openstackclient functional test suite" echo "Running openstackclient functional-tips test suite"
set +e set +e
# Source environment variables to kick things off # Source environment variables to kick things off

7
tox.ini
View File

@@ -58,9 +58,10 @@ passenv = OS_*
setenv = OS_TEST_PATH=./openstackclient/tests/functional setenv = OS_TEST_PATH=./openstackclient/tests/functional
passenv = OS_* passenv = OS_*
commands = commands =
pip install -q -U -e /opt/stack/new/osc-lib pip install -q -U -e "git+file:///opt/stack/new/osc-lib#egg=osc_lib"
pip install -q -U -e /opt/stack/new/python-openstacksdk pip install -q -U -e "git+file:///opt/stack/new/python-openstacksdk#egg=openstacksdk"
pip install -q -U -e /opt/stack/new/os-client-config pip install -q -U -e "git+file:///opt/stack/new/os-client-config#egg=os_client_config"
pip freeze
ostestr {posargs} ostestr {posargs}
[testenv:venv] [testenv:venv]