aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile2
-rw-r--r--tox.ini1
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 \
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}