From db5bcd80c547d0bfb765c137320e01dc403fdb6a Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Thu, 4 May 2023 18:12:00 +0200
Subject: [PATCH] Prepare Xtesting 2023.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I1f9ff35cf62c9cefe193e7bf55dcc2b51b0afdc3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 .gitreview             | 1 -
 .travis.yml            | 4 ++--
 build.sh               | 8 ++++----
 docker/core/Dockerfile | 4 ++--
 tox.ini                | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitreview b/.gitreview
index 7962df65..889158aa 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,3 @@ host=gerrit.opnfv.org
 port=29418
 project=functest-xtesting.git
 defaultbranch=stable/2023.1
-
diff --git a/.travis.yml b/.travis.yml
index f402f118..d85417bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,5 +43,5 @@ jobs:
       script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm,linux/arm64 \
-          --template ${DOCKER_USERNAME}/xtesting:ARCH-latest \
-          --target ${DOCKER_USERNAME}/xtesting:latest
+          --template ${DOCKER_USERNAME}/xtesting:ARCH-2023.1 \
+          --target ${DOCKER_USERNAME}/xtesting:2023.1
diff --git a/build.sh b/build.sh
index 9f14b6e5..5299e549 100644
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ amd64_dirs=${amd64_dirs-"\
 docker/core"}
 arm_dirs=${arm_dirs-${amd64_dirs}}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
-tag=${BRANCH:-latest}
+tag=${BRANCH:-stable/2023.1}
 image="xtesting"
 build_opts=(--pull=true --no-cache --force-rm=true)
 
@@ -25,15 +25,15 @@ for arch in ${arch}; do
         find . -name Dockerfile -exec sed -i \
             -e "s|alpine:3.17|arm64v8/alpine:3.17|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm64-${tag}|g" {} +
+            -e "s|opnfv/xtesting:2023.1|${repo}/xtesting:arm64-${tag}|g" {} +
     elif [[ ${arch} == arm ]]; then
         find . -name Dockerfile -exec sed -i \
             -e "s|alpine:3.17|arm32v6/alpine:3.17|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm-${tag}|g" {} +
+            -e "s|opnfv/xtesting:2023.1|${repo}/xtesting:arm-${tag}|g" {} +
     else
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:amd64-${tag}|g" {} +
+            -e "s|opnfv/xtesting:2023.1|${repo}/xtesting:amd64-${tag}|g" {} +
     fi
     dirs=${arch}_dirs
     for dir in ${!dirs}; do
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index a21eef1a..d9d57048 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.17
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/2023.1
+ARG OPENSTACK_TAG=stable/2023.1
 
 RUN apk -U upgrade && \
     apk --no-cache add --update python3 py3-pip py3-wheel bash git mailcap libxml2 libxslt ansible && \
diff --git a/tox.ini b/tox.ini
index 3af21a1a..3f29681f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ pip_version = pip==20.2.4
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -chttps://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
+  -chttps://opendev.org/openstack/requirements/raw/branch/stable/2023.1/upper-constraints.txt
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}
-- 
2.16.6