diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-30 12:42:59 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-30 12:42:59 +0200 |
| commit | b587669cdba298336dd2966d3562fff47dfe71da (patch) | |
| tree | fc355d562880792b5db2ce0bcabc01099cf2f56d | |
| parent | 46e775abbd5c7897bc782ba188294ad00e13a895 (diff) | |
Use OpenStack stable/ussuri requirements
The branch was just created [1].
[1] https://github.com/openstack/requirements/tree/stable/ussuri
Change-Id: I260f5a30636f2738efdb17315b84f4651412af58
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/benchmarking/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 31e99caf1..ea04b120f 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core:kali ARG BRANCH=stable/kali -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=stable/ussuri ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc ARG NEUTRON_TAG=stable/ussuri diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index db223f3b8..80c728ae8 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.11 -ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG BRANCH=stable/kali +ARG OPENSTACK_TAG=stable/ussuri RUN apk --no-cache add --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index e193a7c1d..c10e766d3 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=stable/kali -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=stable/ussuri ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d ARG TEMPEST_HORIZON_TAG=1.0.0 diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 226a14a99..22ae4f443 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core:kali ARG BRANCH=stable/kali -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=stable/ussuri ARG PATROLE_TAG=0.9.0 ARG NEUTRON_TEMPEST_TAG=1.1.0 ARG CINDER_TEMPEST_TAG=0.3.1 diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 25fd6a074..d8bc69b32 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core:kali ARG BRANCH=stable/kali -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=stable/ussuri ARG VIMS_TEST_TAG=release-130 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 ARG CLOUDIFY_VIMS_TAG=gambia @@ -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/ussuri/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} |