Use OPNFV stable/zed branches

Change-Id: I25b2c26fbb391c6d11352c9b382246bd8f565428
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 3b35af3..500dc01 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
 FROM alpine:3.16
 
 ARG BRANCH=stable/v1.28
-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 75b252d..c26a5c8 100644 (file)
--- 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}