diff options
| -rw-r--r-- | .gitreview | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | ansible/site.yml | 3 | ||||
| -rw-r--r-- | build.sh | 8 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 4 | ||||
| -rwxr-xr-x | elements/xtesting/install.d/16-xtesting | 7 | ||||
| -rw-r--r-- | tox.ini | 2 |
7 files changed, 18 insertions, 12 deletions
@@ -2,4 +2,4 @@ host=gerrit.opnfv.org port=29418 project=functest-xtesting.git - +defaultbranch=stable/2023.2 diff --git a/.travis.yml b/.travis.yml index f402f118..66cf2db7 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.2 \ + --target ${DOCKER_USERNAME}/xtesting:2023.2 diff --git a/ansible/site.yml b/ansible/site.yml index a2124729..64a7597d 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -2,6 +2,9 @@ - hosts: 127.0.0.1 roles: - role: collivier.xtesting + docker_tags: + - '2023.2': + branch: stable/2023.2 suites: - container: xtesting tests: @@ -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.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:2023.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:2023.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:2023.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 a21eef1a..75e7f39e 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.2 +ARG OPENSTACK_TAG=stable/2023.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..df8fcb47 100755 --- 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:2023.2 +git init /home/debian/functest-xtesting && \ +(cd /home/debian/functest-xtesting && \ + git fetch --tags https://git.opnfv.org/functest-xtesting stable/2023.2 && \ + git checkout FETCH_HEAD) && \ chown -R 1000:1000 /home/debian/functest-xtesting exit 0 @@ -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.2/upper-constraints.txt -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} |