From e16f6c99876a27cc108474bd6563048819b5a8f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 18 Dec 2024 16:10:24 +0100 Subject: [PATCH] Publish Xtesting 2024.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Id488efc487440111622ca86f062455fc450717a7 Signed-off-by: Cédric Ollivier --- .travis.yml | 4 ++-- ansible/site.gate.yml | 4 ++-- ansible/site.yml | 3 +++ build.sh | 8 ++++---- docker/core/Dockerfile | 4 ++-- elements/xtesting/install.d/16-xtesting | 7 +++++-- tox.ini | 2 +- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index f402f118..f142c6b1 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-2024.2 \ + --target ${DOCKER_USERNAME}/xtesting:2024.2 diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 57b49d2e..88db5bef 100644 --- 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 + - '2024.2': + branch: stable/2024.2 dependency: '3.20' builds: dependency: diff --git a/ansible/site.yml b/ansible/site.yml index a2124729..8b40f2db 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -2,6 +2,9 @@ - hosts: 127.0.0.1 roles: - role: collivier.xtesting + docker_tags: + - '2024.2': + branch: stable/2024.2 suites: - container: xtesting tests: diff --git a/build.sh b/build.sh index 9f14b6e5..7cfe3844 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/2024.2} 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:2024.2|${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:2024.2|${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:2024.2|${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 409cd2d8..f83d1d60 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.20 -ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG BRANCH=stable/2024.2 +ARG OPENSTACK_TAG=stable/2024.2 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 d3808556..c7b7de48 100644 --- 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:2024.2 +git init /home/debian/functest-xtesting && \ +(cd /home/debian/functest-xtesting && \ + git fetch --tags https://git.opnfv.org/functest-xtesting stable/2024.2 && \ + git checkout FETCH_HEAD) && \ chown -R 1000:1000 /home/debian/functest-xtesting exit 0 diff --git a/tox.ini b/tox.ini index c45a924c..87fcb756 100644 --- 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/2024.2/upper-constraints.txt -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} -- 2.16.6