From 767a1cf10c26f1ad4fa5a9e871d12e7eacc28909 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 4 Oct 2020 15:44:46 +0200 Subject: [PATCH] Fix BRANCH and OPNFV_TAG in stable/leguer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I82797911296ac68701bbe1ced37c3c843360d92c Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index fd7a40be..461cdfca 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,8 +1,8 @@ FROM alpine:3.12 -ARG BRANCH=master +ARG BRANCH=stable/leguer ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master +ARG OPNFV_TAG=stable/leguer COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch diff --git a/tox.ini b/tox.ini index 8532aa5e..9d58f5dc 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist = pep8,pylint,yamllint,ansiblelint,bashate,py38,bandit,perm [testenv] usedevelop = True deps = - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=stable/leguer -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -- 2.16.6