Update Xtesting to stable/xena

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

diff --git a/.travis.yml b/.travis.yml
index 3c798de..dfb774f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,8 +43,8 @@ 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-xena \
+          --target ${DOCKER_USERNAME}/xtesting:xena
     - stage: build xtesting-mts images
       script: sudo -E bash build.sh
       env:
@@ -71,5 +71,5 @@ jobs:
       script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm,linux/arm64 \
-          --template ${DOCKER_USERNAME}/xtesting-mts:ARCH-latest \
-          --target ${DOCKER_USERNAME}/xtesting-mts:latest
+          --template ${DOCKER_USERNAME}/xtesting-mts:ARCH-xena \
+          --target ${DOCKER_USERNAME}/xtesting-mts:xena

diff --git a/build.sh b/build.sh
index 0fc6f09..2c4929d 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ docker/core \
 docker/mts"}
 arm_dirs=${arm_dirs-${amd64_dirs}}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
-tag=${BRANCH:-latest}
+tag=${BRANCH:-stable/xena}
 image="xtesting"
 build_opts=(--pull=true --no-cache --force-rm=true)
 
@@ -26,15 +26,15 @@ for arch in ${arch}; do
         find . -name Dockerfile -exec sed -i \
             -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm64-${tag}|g" {} +
+            -e "s|opnfv/xtesting:xena|${repo}/xtesting:arm64-${tag}|g" {} +
     elif [[ ${arch} == arm ]]; then
         find . -name Dockerfile -exec sed -i \
             -e "s|alpine:3.14|arm32v6/alpine:3.14|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm-${tag}|g" {} +
+            -e "s|opnfv/xtesting:xena|${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:xena|${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 c91c636..b4b0c67 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.14
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/xena
+ARG OPENSTACK_TAG=stable/xena
 
 RUN apk -U upgrade && \
     apk --no-cache add --update python3 py3-pip py3-wheel bash git mailcap libxml2 libxslt ansible && \

diff --git a/docker/mts/Dockerfile b/docker/mts/Dockerfile
index eae61aa..9f8076b 100644 (file)
--- a/docker/mts/Dockerfile
+++ b/docker/mts/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/xtesting
+FROM opnfv/xtesting:xena
 
 ARG MTS_TAG=6.6.21
 ARG APP_FOLDER=/opt/mts

diff --git a/tox.ini b/tox.ini
index a7304e4..dca93ba 100644 (file)
--- 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/xena/upper-constraints.txt
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}