From b4f13be29be29173b8943d82da7c0e2c5ee6c203 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 11 Oct 2021 09:44:16 +0200 Subject: Prepare all Functest stable/xena containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic843ba12132bf25ad7c339bd483f0a211ac2d003 Signed-off-by: Cédric Ollivier --- .travis.yml | 28 ++++++------- build.sh | 48 +++++++++++----------- docker/benchmarking-cntt/Dockerfile | 2 +- docker/benchmarking/Dockerfile | 2 +- docker/healthcheck/Dockerfile | 2 +- docker/smoke-cntt/Dockerfile | 2 +- docker/smoke/Dockerfile | 2 +- docker/vnf/Dockerfile | 2 +- .../tempest/custom_tests/tempest_conf.yaml | 6 +-- .../tempest/custom_tests/tempest_conf_ovn.yaml | 6 +-- functest/utils/functest_utils.py | 4 +- tox.ini | 2 +- 12 files changed, 54 insertions(+), 52 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16c5c457f..773984ca1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,8 +42,8 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-core:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-core:latest + --template ${DOCKER_USERNAME}/functest-core:ARCH-xena \ + --target ${DOCKER_USERNAME}/functest-core:xena - stage: build all functest images script: sudo -E bash build.sh env: @@ -121,23 +121,23 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-healthcheck:latest + --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-xena \ + --target ${DOCKER_USERNAME}/functest-healthcheck:xena - script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-smoke:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-smoke:latest + --template ${DOCKER_USERNAME}/functest-smoke:ARCH-xena \ + --target ${DOCKER_USERNAME}/functest-smoke:xena - script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-benchmarking:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-benchmarking:latest + --template ${DOCKER_USERNAME}/functest-benchmarking:ARCH-xena \ + --target ${DOCKER_USERNAME}/functest-benchmarking:xena - script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-vnf:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-vnf:latest + --template ${DOCKER_USERNAME}/functest-vnf:ARCH-xena \ + --target ${DOCKER_USERNAME}/functest-vnf:xena - stage: build all functest cntt images script: sudo -E bash build.sh env: @@ -179,10 +179,10 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-smoke-cntt:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-smoke-cntt:latest + --template ${DOCKER_USERNAME}/functest-smoke-cntt:ARCH-xena \ + --target ${DOCKER_USERNAME}/functest-smoke-cntt:xena - script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-benchmarking-cntt:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-benchmarking-cntt:latest + --template ${DOCKER_USERNAME}/functest-benchmarking-cntt:ARCH-xena \ + --target ${DOCKER_USERNAME}/functest-benchmarking-cntt:xena diff --git a/build.sh b/build.sh index effd07500..65071bc61 100644 --- a/build.sh +++ b/build.sh @@ -16,63 +16,63 @@ arm64_dirs=${arm64_dirs-${amd64_dirs}} build_opts=("--pull=true" --no-cache "--force-rm=true") find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} + + -e "s|opnfv/functest-core:xena|${repo}/functest-core:amd64-xena|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-smoke|${repo}/functest-smoke:amd64-latest|g" {} + + -e "s|opnfv/functest-smoke:xena|${repo}/functest-smoke:amd64-xena|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-benchmarking|\ -${repo}/functest-benchmarking:amd64-latest|g" {} + + -e "s|opnfv/functest-benchmarking:xena|\ +${repo}/functest-benchmarking:amd64-xena|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-${dir##**/}:amd64-latest" .) - docker push "${repo}/functest-${dir##**/}:amd64-latest" + -t "${repo}/functest-${dir##**/}:amd64-xena" .) + docker push "${repo}/functest-${dir##**/}:amd64-xena" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) + (docker rmi "${repo}/functest-${dir##**/}:amd64-xena" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.13 || true) + (docker rmi "${repo}/functest-core:amd64-xena" alpine:3.13 || true) find . -name Dockerfile -exec git checkout {} + 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/functest-core|${repo}/functest-core:arm64-latest|g" {} + + -e "s|opnfv/functest-core:xena|${repo}/functest-core:arm64-xena|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-smoke|${repo}/functest-smoke:arm64-latest|g" {} + + -e "s|opnfv/functest-smoke:xena|${repo}/functest-smoke:arm64-xena|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-benchmarking|\ -${repo}/functest-benchmarking:arm64-latest|g" {} + + -e "s|opnfv/functest-benchmarking:xena|\ +${repo}/functest-benchmarking:arm64-xena|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-${dir##**/}:arm64-latest" .) - docker push "${repo}/functest-${dir##**/}:arm64-latest" + -t "${repo}/functest-${dir##**/}:arm64-xena" .) + docker push "${repo}/functest-${dir##**/}:arm64-xena" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true) + (docker rmi "${repo}/functest-${dir##**/}:arm64-xena" || true) done [ -n "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-core:arm64-latest" \ + (docker rmi "${repo}/functest-core:arm64-xena" \ arm64v8/alpine:3.13 || true) find . -name Dockerfile -exec git checkout {} + 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/functest-core|${repo}/functest-core:arm-latest|g" {} + + -e "s|opnfv/functest-core:xena|${repo}/functest-core:arm-xena|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-smoke|${repo}/functest-smoke:arm-latest|g" {} + + -e "s|opnfv/functest-smoke:xena|${repo}/functest-smoke:arm-xena|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-benchmarking|\ -${repo}/functest-benchmarking:arm-latest|g" {} + + -e "s|opnfv/functest-benchmarking:xena|\ +${repo}/functest-benchmarking:arm-xena|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-${dir##**/}:arm-latest" .) - docker push "${repo}/functest-${dir##**/}:arm-latest" + -t "${repo}/functest-${dir##**/}:arm-xena" .) + docker push "${repo}/functest-${dir##**/}:arm-xena" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-${dir##**/}:arm-latest" || true) + (docker rmi "${repo}/functest-${dir##**/}:arm-xena" || true) done [ -n "${arm_dirs}" ] && - (docker rmi "${repo}/functest-core:arm-latest" \ + (docker rmi "${repo}/functest-core:arm-xena" \ arm32v6/alpine:3.13 || true) find . -name Dockerfile -exec git checkout {} + diff --git a/docker/benchmarking-cntt/Dockerfile b/docker/benchmarking-cntt/Dockerfile index 01a430a5e..16661e677 100644 --- a/docker/benchmarking-cntt/Dockerfile +++ b/docker/benchmarking-cntt/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-benchmarking +FROM opnfv/functest-benchmarking:xena COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml COPY blacklist.yaml /src/functest/functest/opnfv_tests/openstack/rally/blacklist.yaml diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 547aa1f3c..3b240ad2c 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:xena ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc ARG NEUTRON_TAG=master diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index d7ee1e769..a1e37b0c3 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:xena ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile index 7db582bf4..944f6500f 100644 --- a/docker/smoke-cntt/Dockerfile +++ b/docker/smoke-cntt/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-smoke +FROM opnfv/functest-smoke:xena COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml COPY tempest_conf.yaml /src/functest/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 19b2a1403..1fc5c984e 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:xena ARG PATROLE_TAG=master ARG NEUTRON_TEMPEST_TAG=master diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index cf58a7ef6..92c925da7 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:xena ARG VIMS_TEST_TAG=release-130 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml index ca1165575..476c0f2e4 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -1,6 +1,6 @@ --- compute: - max_microversion: latest + max_microversion: '2.90' compute-feature-enabled: attach_encrypted_volume: false block_migration_for_live_migration: false @@ -55,14 +55,14 @@ network-feature-enabled: port_admin_state_change: true port_security: true placement: - max_microversion: latest + max_microversion: 1.38 validation: image_ssh_user: cirros ssh_timeout: 196 ip_version_for_ssh: 4 run_validation: true volume: - max_microversion: latest + max_microversion: 3.66 storage_protocol: ceph manage_volume_ref: source-name,volume-%s manage_snapshot_ref: source-name,snapshot-%s diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml index ab82b87b1..8bb0e7ffb 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml @@ -1,6 +1,6 @@ --- compute: - max_microversion: latest + max_microversion: '2.90' compute-feature-enabled: attach_encrypted_volume: false block_migration_for_live_migration: false @@ -55,14 +55,14 @@ network-feature-enabled: port_admin_state_change: true port_security: true placement: - max_microversion: latest + max_microversion: 1.38 validation: image_ssh_user: cirros ssh_timeout: 196 ip_version_for_ssh: 4 run_validation: true volume: - max_microversion: latest + max_microversion: 3.66 storage_protocol: ceph manage_volume_ref: source-name,volume-%s manage_snapshot_ref: source-name,snapshot-%s diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index 31e453504..b384950e0 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -112,8 +112,10 @@ def get_openstack_version(cloud): version = get_nova_version(cloud) try: assert version - if version > (2, 88): + if version > (2, 90): osversion = "Master" + elif version > (2, 88): + osversion = "Xena" elif version > (2, 87): osversion = "Wallaby" elif version > (2, 79): diff --git a/tox.ini b/tox.ini index c52fad15d..a316d9914 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ pip_version = pip==20.2.4 usedevelop = True deps = -c{toxinidir}/upper-constraints.txt - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://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} -- cgit 1.2.3-korg