Allow building wallaby containers

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

diff --git a/.travis.yml b/.travis.yml
index 6a23ba7..20caef9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,8 +50,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-wallaby \
+          --target ${DOCKER_USERNAME}/xtesting:wallaby
     - stage: build xtesting-mts images
       script: sudo -E bash build.sh
       env:
@@ -78,5 +78,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-wallaby \
+          --target ${DOCKER_USERNAME}/xtesting-mts:wallaby

diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index e2d788d..f768ee8 100644 (file)
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -7,7 +7,7 @@
       git_url: https://gerrit.opnfv.org/gerrit/functest-xtesting
       docker_tags:
         - latest:
-            branch: master
+            branch: stable/wallaby
             dependency: '3.13'
       builds:
         dependency:
@@ -34,6 +34,7 @@
             - fourth
             - fifth
             - sixth
+            - eighth
         - container: xtesting-mts
           tests:
             - seventh

diff --git a/build.sh b/build.sh
index f0d768d..4778728 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:-wallaby}
 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.13|arm64v8/alpine:3.13|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm64-${tag}|g" {} +
+            -e "s|opnfv/xtesting:${tag}|${repo}/xtesting:arm64-${tag}|g" {} +
     elif [[ ${arch} == arm ]]; then
         find . -name Dockerfile -exec sed -i \
             -e "s|alpine:3.13|arm32v6/alpine:3.13|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm-${tag}|g" {} +
+            -e "s|opnfv/xtesting:${tag}|${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:${tag}|${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 45248ff..8330102 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.13
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/wallaby
+ARG OPENSTACK_TAG=stable/wallaby
 
 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 b4bf6c5..3306d9b 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/wallaby/upper-constraints.txt
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}