Prepare Xtesting 2025.1

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

diff --git a/.gitreview b/.gitreview
index 8db5dfe..839213b 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.opnfv.org
 port=29418
 project=functest-xtesting.git
-
+defaultbranch=stable/2025.1

diff --git a/.travis.yml b/.travis.yml
index f402f11..198008e 100644 (file)
--- 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-2025.1 \
+          --target ${DOCKER_USERNAME}/xtesting:2025.1

diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index 60c5aec..36c6293 100644 (file)
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -6,8 +6,8 @@
       gerrit_project: functest-xtesting
       git_url: https://gerrit.opnfv.org/gerrit/functest-xtesting
       docker_tags:
-        - latest:
-            branch: master
+        - '2025.1':
+            branch: stable/2025.1
             dependency: '3.21'
       builds:
         dependency:

diff --git a/ansible/site.yml b/ansible/site.yml
index a212472..67ae7df 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -2,6 +2,9 @@
 - hosts: 127.0.0.1
   roles:
     - role: collivier.xtesting
+      docker_tags:
+        - '2025.1':
+            branch: stable/2025.1
       suites:
         - container: xtesting
           tests:

diff --git a/build.sh b/build.sh
index 9f14b6e..c32c1f0 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -16,24 +16,24 @@ amd64_dirs=${amd64_dirs-"\
 docker/core"}
 arm_dirs=${arm_dirs-${amd64_dirs}}
 arm64_dirs=${arm64_dirs-${amd64_dirs}}
-tag=${BRANCH:-latest}
+tag=${BRANCH:-stable/2025.1}
 image="xtesting"
 build_opts=(--pull=true --no-cache --force-rm=true)
 
 for arch in ${arch}; do
     if [[ ${arch} == arm64 ]]; then
         find . -name Dockerfile -exec sed -i \
-            -e "s|alpine:3.17|arm64v8/alpine:3.17|g" {} +
+            -e "s|alpine:3.21|arm64v8/alpine:3.21|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm64-${tag}|g" {} +
+            -e "s|opnfv/xtesting:2025.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" {} +
+            -e "s|alpine:3.21|arm32v6/alpine:3.21|g" {} +
         find . -name Dockerfile -exec sed -i \
-            -e "s|opnfv/xtesting|${repo}/xtesting:arm-${tag}|g" {} +
+            -e "s|opnfv/xtesting:2025.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:2025.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 95371cb..9353ada 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.21
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/2025.1
+ARG OPENSTACK_TAG=stable/2025.1
 
 RUN apk -U upgrade && \
     apk --no-cache add --update python3 py3-pip py3-wheel bash git mailcap libxml2 libxslt ansible && \

diff --git a/elements/xtesting/install.d/16-xtesting b/elements/xtesting/install.d/16-xtesting
index d380855..440d085 100644 (file)
--- a/elements/xtesting/install.d/16-xtesting
+++ b/elements/xtesting/install.d/16-xtesting
@@ -1,8 +1,11 @@
 #!/bin/bash
 
 download-frozen-image-v2.sh /data/docker/xtesting \
-  opnfv/xtesting:latest
-git clone https://git.opnfv.org/functest-xtesting /home/debian/functest-xtesting
+  opnfv/xtesting:2025.1
+git init /home/debian/functest-xtesting && \
+(cd /home/debian/functest-xtesting && \
+  git fetch --tags https://git.opnfv.org/functest-xtesting stable/2025.1 && \
+  git checkout FETCH_HEAD) && \
 chown -R 1000:1000 /home/debian/functest-xtesting
 
 exit 0

diff --git a/tox.ini b/tox.ini
index c45a924..f48f087 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
 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/2025.1/upper-constraints.txt
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}