From c28cfec632b47e1c631fd100abbc759a1a2e3489 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 13 Sep 2018 09:41:19 +0200 Subject: Update to OpenStack master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I894bb969d690537f6910b8cfcdb52162747121a6 Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 2 +- docker/features/Dockerfile | 2 +- 2 files changed, 2 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 \ -- cgit 1.2.3-korg From fb23a333f8c5516f70f6cfb9b2d2c01a5bf91cea Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 13 Sep 2018 09:42:37 +0200 Subject: Add OpenStack constraints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2b52f6594629b171312caf25906b9e582613379b Signed-off-by: Cédric Ollivier --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 098556d6..7f7032d6 100644 --- a/tox.ini +++ b/tox.ini @@ -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} -- cgit 1.2.3-korg