diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-13 08:19:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-13 08:19:34 +0000 |
| commit | e2ef3a3fcf062e65bb22e7f59f258fd8ea786522 (patch) | |
| tree | de858dfdf16a0d420f787114000b895f0ec70e34 | |
| parent | 84523ea1615c5702d395b03a65e7bcc190406e98 (diff) | |
| parent | fb23a333f8c5516f70f6cfb9b2d2c01a5bf91cea (diff) | |
Merge changes I2b52f659,I894bb969
* changes:
Add OpenStack constraints
Update to OpenStack master
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 5150c393..121fc0aa 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master RUN apk --no-cache add --update python py-pip bash git grep && \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 9b626d3b..d8b1ae98 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,6 +1,6 @@ FROM opnfv/functest-kubernetes-core -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master RUN apk --no-cache add --update make py-pip bash git go \ @@ -5,6 +5,7 @@ envlist = pep8,pylint,yamllint,bashate,py27,py35 usedevelop = True deps = -chttps://git.opnfv.org/functest/plain/upper-constraints.txt + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} |