aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-10-06 23:43:04 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-10-06 23:43:04 +0200
commit7c7dc6555135fd8bc205edbd0eb6627b7e486667 (patch)
treec354bd3e475e249a07b5eb380f428d262a001c24
parent06bed63f9b006e9ac44c5281cc27caf8dbb7e961 (diff)
Update upper-constraints
It takes the new requirements just published into account. Change-Id: I27619b9deb68d72c9727df669ec413cd383a8c3d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 2605897d1..0a128d1d6 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.12
ARG BRANCH=stable/leguer
-ARG OPENSTACK_TAG=master
+ARG OPENSTACK_TAG=stable/victoria
COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch
diff --git a/tox.ini b/tox.ini
index 466c415a8..7a78acb75 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py38,cover,perm
usedevelop = True
deps =
-c{toxinidir}/upper-constraints.txt
- -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+ -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/victoria/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}