aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2023-11-30 16:43:40 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2023-11-30 16:45:18 +0100
commite284019e7b9d75925c171f228d4a3567e1cfb41b (patch)
treec8d37e23561f9386cc076d2e216237b63e7253c0
parentc81d3b323aad8e3451f81a263fb790afe3d4850c (diff)
Use OPNFV stable/zed branches
Change-Id: I25b2c26fbb391c6d11352c9b382246bd8f565428 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit dd410d187c2d20f3226baf71c2aae2054fd171fa)
-rw-r--r--docker/core/Dockerfile4
-rw-r--r--tox.ini4
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 37e98dd5..3b2edf48 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
FROM alpine:3.16
ARG BRANCH=stable/v1.27
-ARG OPENSTACK_TAG=stable/2023.1
-ARG OPNFV_TAG=stable/2023.1
+ARG OPENSTACK_TAG=stable/zed
+ARG OPNFV_TAG=stable/zed
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 75b252d9..c26a5c87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,8 @@ envlist = pep8,pylint,yamllint,bashate,py310,bandit,perm
pip_version = pip==20.2.4
usedevelop = True
deps =
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=stable/2023.1
- -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/2023.1/upper-constraints.txt}
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=stable/zed
+ -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/zed/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}