summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-20 12:25:43 +0000
committerGerrit Code Review <review@openstack.org>2019-12-20 12:25:43 +0000
commitb4bc1d85f0f6e3a625cbfb0af1ecb9b08dff310d (patch)
treec527bb51c222fbef023e4a63efe901290dee1232
parent2656c90285508481ccc6c2c20796154ebf9af7dc (diff)
parent52c5646a9de746f26f03f7adada986ab8ee69f87 (diff)
downloadtrove-b4bc1d85f0f6e3a625cbfb0af1ecb9b08dff310d.tar.gz
Merge "Fix trovestack tox job"
-rw-r--r--test-upper-constraints.txt2
-rw-r--r--tox.ini4
2 files changed, 1 insertions, 5 deletions
diff --git a/test-upper-constraints.txt b/test-upper-constraints.txt
index fe1a3651..b7d3f09b 100644
--- a/test-upper-constraints.txt
+++ b/test-upper-constraints.txt
@@ -1 +1 @@
-git+https://opendev.org/openstack/python-troveclient#egg=python-troveclient
+git+https://opendev.org/openstack/python-troveclient@master#egg=python-troveclient
diff --git a/tox.ini b/tox.ini
index 3e0121e3..56efdc5d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -106,11 +106,7 @@ deps =
-r{toxinidir}/requirements.txt
[testenv:trovestack]
-skip_install = True
changedir = {toxinidir}/integration/scripts
passenv = *
commands =
- pip install --no-binary :all: {toxinidir} \
- -c/opt/stack/trove/test-upper-constraints.txt \
- -chttps://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
./trovestack {posargs}