From ebd5c981b86c4e692c0f0f3a7e5c5c2dda403a90 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 20 Aug 2021 12:18:25 +0200 Subject: Take v1.22 into account MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iec601131e41bf3e9c6c5b2e381dc9089d545bca8 Signed-off-by: Cédric Ollivier --- .travis.yml | 24 +++++++++--------- ansible/site.gate.yml | 3 +++ ansible/site.yml | 3 +++ build.sh | 56 +++++++++++++++++++++--------------------- docker/benchmarking/Dockerfile | 6 ++--- docker/cnf/Dockerfile | 4 +-- docker/core/Dockerfile | 6 ++--- docker/healthcheck/Dockerfile | 4 +-- docker/security/Dockerfile | 2 +- docker/smoke/Dockerfile | 2 +- tox.ini | 4 +-- 11 files changed, 60 insertions(+), 54 deletions(-) diff --git a/.travis.yml b/.travis.yml index 818bca75..db3afc24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,8 @@ jobs: script: > manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-core:latest + --template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-v1.22 \ + --target ${DOCKER_USERNAME}/functest-kubernetes-core:v1.22 - stage: build functest-kubernetes-[healthcheck,cnf,security] images script: bash build.sh env: @@ -102,19 +102,19 @@ jobs: manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ --template \ - ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:latest + ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-v1.22 \ + --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:v1.22 - script: > manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-kubernetes-cnf:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-cnf:latest + --template ${DOCKER_USERNAME}/functest-kubernetes-cnf:ARCH-v1.22 \ + --target ${DOCKER_USERNAME}/functest-kubernetes-cnf:v1.22 - script: > manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ --template \ - ${DOCKER_USERNAME}/functest-kubernetes-security:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-security:latest + ${DOCKER_USERNAME}/functest-kubernetes-security:ARCH-v1.22 \ + --target ${DOCKER_USERNAME}/functest-kubernetes-security:v1.22 - stage: build functest-kubernetes-smoke image script: bash build.sh env: @@ -138,8 +138,8 @@ jobs: script: > manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:latest + --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-v1.22 \ + --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:v1.22 - stage: build functest-kubernetes-benchmarking image script: bash build.sh env: @@ -164,5 +164,5 @@ jobs: manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ --template \ - ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:latest + ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:ARCH-v1.22 \ + --target ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:v1.22 diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 3c63de89..c1580042 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -5,6 +5,9 @@ project: functest-kubernetes db_project: functest gerrit_project: functest-kubernetes + docker_tags: + - v1.22: + branch: stable/v1.22 builds: dependencies: - repo: _ diff --git a/ansible/site.yml b/ansible/site.yml index 765bf491..cd2683d6 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -4,6 +4,9 @@ - role: collivier.xtesting project: functest-kubernetes db_project: functest + docker_tags: + - v1.22: + branch: stable/v1.22 suites: - container: functest-kubernetes-healthcheck tests: diff --git a/build.sh b/build.sh index 8da61c42..9b9821c9 100644 --- a/build.sh +++ b/build.sh @@ -15,71 +15,71 @@ 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-kubernetes-core|\ -${repo}/functest-kubernetes-core:amd64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-core:v1.22|\ +${repo}/functest-kubernetes-core:amd64-v1.22|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-healthcheck:v1.22|\ +${repo}/functest-kubernetes-healthcheck:amd64-v1.22|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" .) - docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" + -t "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.22" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.22" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.22" || true) done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-latest" \ + "${repo}/functest-kubernetes-core:amd64-v1.22" \ alpine:3.14 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ -${repo}/functest-kubernetes-core:arm64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-core:v1.22|\ +${repo}/functest-kubernetes-core:arm64-v1.22|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-healthcheck:v1.22|\ +${repo}/functest-kubernetes-healthcheck:arm64-v1.22|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-smoke|\ -${repo}/functest-kubernetes-smoke:arm64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-smoke:v1.22|\ +${repo}/functest-kubernetes-smoke:arm64-v1.22|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .) - docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" + -t "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.22" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.22" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.22" || true) done [ ! -z "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ + (docker rmi "${repo}/functest-kubernetes-core:arm64-v1.22" \ arm64v8/alpine:3.14 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.14|arm32v7/alpine:3.14|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ -${repo}/functest-kubernetes-core:arm-latest|g" {} + + -e "s|opnfv/functest-kubernetes-core:v1.22|\ +${repo}/functest-kubernetes-core:arm-v1.22|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck:arm-latest|g" {} + + -e "s|opnfv/functest-kubernetes-healthcheck:v1.22|\ +${repo}/functest-kubernetes-healthcheck:arm-v1.22|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-smoke|\ -${repo}/functest-kubernetes-smoke:arm-latest|g" {} + + -e "s|opnfv/functest-kubernetes-smoke:v1.22|\ +${repo}/functest-kubernetes-smoke:arm-v1.22|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}:arm-latest" .) - docker push "${repo}/functest-kubernetes-${dir##**/}:arm-latest" + -t "${repo}/functest-kubernetes-${dir##**/}:arm-v1.22" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm-v1.22" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:arm-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:arm-v1.22" || true) done [ ! -z "${arm_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ + (docker rmi "${repo}/functest-kubernetes-core:arm-v1.22" \ arm32v7/alpine:3.14 || true) find . -name Dockerfile -exec git checkout {} + diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 3dc88c2e..fa107d51 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ -FROM opnfv/functest-kubernetes-smoke +FROM opnfv/functest-kubernetes-smoke:v1.22 -ARG NETPERF_TAG=master -ARG PLOTPERF_TAG=master +ARG NETPERF_TAG=8a5a7a23f2165b29e46b4d32aad7d5f85e4b9516 +ARG PLOTPERF_TAG=2455313f4b9581795a8f642243acaad472d91804 COPY plotperf.py.patch /tmp/plotperf.py.patch RUN apk --no-cache add --update py3-matplotlib && \ diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index c7cd53d1..1a5aa06b 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,11 +1,11 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.22 ARG K8S_TAG=1.22 ARG CNF_TESTSUITE_TAG=v0.11.2 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ --output /usr/local/bin/kubectl && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 6027f570..683bc4ec 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,8 +1,8 @@ FROM alpine:3.14 -ARG BRANCH=master -ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master +ARG BRANCH=stable/v1.22 +ARG OPENSTACK_TAG=stable/wallaby +ARG OPNFV_TAG=stable/wallaby COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 4788413d..919eb056 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,9 +1,9 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.22 ARG K8S_TAG=1.22 RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ -s --output /usr/local/bin/kubectl && \ diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile index d3434366..1396109e 100644 --- a/docker/security/Dockerfile +++ b/docker/security/Dockerfile @@ -1,3 +1,3 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.22 COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index d410efb3..1a80b508 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-healthcheck +FROM opnfv/functest-kubernetes-healthcheck:v1.22 COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/tox.ini b/tox.ini index 01a8286d..7d444186 100644 --- a/tox.ini +++ b/tox.ini @@ -5,8 +5,8 @@ envlist = pep8,pylint,yamllint,ansiblelint,bashate,py39,bandit,perm pip_version = pip==20.2.4 usedevelop = True deps = - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=stable/wallaby + -c{env:UPPER_CONSTRAINTS_FILE:https://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} -- cgit 1.2.3-korg