Skip to content

Commit 63cdf07

Browse files
emontystevemar
authored andcommitted
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
1 parent f8e2cf8 commit 63cdf07

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

openstackclient/tests/functional/post_test_hook_tips.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
# http://docs.openstack.org/developer/python-openstackclient/
88

99
# This particular script differs from the normal post_test_hook because
10-
# it installs the master (tip) version of osc-lib and openstacksdk
10+
# it installs the master (tip) version of osc-lib, os-client-config
11+
# and openstacksdk, OSCs most important dependencies.
1112

1213
function generate_testr_results {
1314
if [ -f .testrepository/0 ]; then
14-
sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
15+
sudo .tox/functional-tips/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
1516
sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
16-
sudo .tox/functional/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
17+
sudo .tox/functional-tips/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
1718
sudo gzip -9 $BASE/logs/testrepository.subunit
1819
sudo gzip -9 $BASE/logs/testr_results.html
1920
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
2829
cd $OPENSTACKCLIENT_DIR
2930

3031
# Run tests
31-
echo "Running openstackclient functional test suite"
32+
echo "Running openstackclient functional-tips test suite"
3233
set +e
3334

3435
# Source environment variables to kick things off

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ passenv = OS_*
5858
setenv = OS_TEST_PATH=./openstackclient/tests/functional
5959
passenv = OS_*
6060
commands =
61-
pip install -q -U -e /opt/stack/new/osc-lib
62-
pip install -q -U -e /opt/stack/new/python-openstacksdk
63-
pip install -q -U -e /opt/stack/new/os-client-config
61+
pip install -q -U -e "git+file:///opt/stack/new/osc-lib#egg=osc_lib"
62+
pip install -q -U -e "git+file:///opt/stack/new/python-openstacksdk#egg=openstacksdk"
63+
pip install -q -U -e "git+file:///opt/stack/new/os-client-config#egg=os_client_config"
64+
pip freeze
6465
ostestr {posargs}
6566

6667
[testenv:venv]

0 commit comments

Comments
 (0)