aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-30 12:45:25 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-30 12:45:25 +0200
commitb8995312241cd9f46d763dfed498a5186b9b8239 (patch)
tree3ef4097c3a4408524006530696a4cec71dbc028f
parent25aa4791c9ff3bbaa0b93a55475b83c2576e40c9 (diff)
Use OpenStack stable/ussuri requirements
The branch was just created [1]. [1] https://github.com/openstack/requirements/tree/stable/ussuri Change-Id: Ib5d6a773f3ba20eaa1d54febbafae8b7bd1cde94 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 7b37e046..eb495c00 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
FROM golang:1.13-alpine3.11
ARG BRANCH=stable/kali
-ARG OPENSTACK_TAG=master
+ARG OPENSTACK_TAG=stable/ussuri
ARG OPNFV_TAG=stable/kali
RUN apk --no-cache add --update python3 bash git grep libffi openssl mailcap && \
diff --git a/tox.ini b/tox.ini
index 45a8183a..c5364d58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = pep8,pylint,yamllint,ansiblelint,bashate,py38,bandit,perm
usedevelop = True
deps =
-chttps://git.opnfv.org/functest/plain/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/ussuri/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}