diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2020-04-30 11:10:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-04-30 11:10:54 +0000 |
| commit | 85d11cf6a4eeb0e0dc72f25979ac69a39d0b81aa (patch) | |
| tree | 589d9d7072b86e5b18bdec6d7ba18fe24ffaf9e5 | |
| parent | 2534c5652651551b4610d1eae385390b119af8ba (diff) | |
| parent | e9b851d20f632a312f40fea0251a21d2e1d85e1d (diff) | |
Merge "Use OpenStack stable/ussuri requirements" into stable/kali
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 83a3b13b..2288e7ca 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.11 ARG BRANCH=stable/kali -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=stable/ussuri RUN apk --no-cache add --update python3 bash git mailcap && \ apk --no-cache add --virtual .build-deps --update \ @@ -6,7 +6,7 @@ skipsdist = True usedevelop = True deps = -c{toxinidir}/upper-constraints.txt - -chttps://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt + -chttps://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} |