diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2023-11-30 14:35:42 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2023-11-30 14:41:59 +0100 |
commit | c81d3b323aad8e3451f81a263fb790afe3d4850c (patch) | |
tree | 1e821f13879bf5214bb334822aad4cbdfb2f819a | |
parent | 504b9be3907c4397228e10cf9efa6fcabb1163a3 (diff) |
Update to v1.27
Change-Id: I3007d4545cb80b54b9858dafbfc2442b32bcbb5e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r-- | README.md | 13 | ||||
-rw-r--r-- | ansible/site.cntt.yml | 3 | ||||
-rw-r--r-- | ansible/site.gate.yml | 3 | ||||
-rw-r--r-- | ansible/site.yml | 3 | ||||
-rw-r--r-- | build.sh | 60 | ||||
-rw-r--r-- | docker/benchmarking/Dockerfile | 6 | ||||
-rw-r--r-- | docker/cnf/Dockerfile | 5 | ||||
-rw-r--r-- | docker/core/Dockerfile | 6 | ||||
-rw-r--r-- | docker/healthcheck/Dockerfile | 5 | ||||
-rw-r--r-- | docker/security/Dockerfile | 2 | ||||
-rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
-rwxr-xr-x | elements/functest-kubernetes/install.d/16-functest-kubernetes | 10 | ||||
-rw-r--r-- | functest_kubernetes/security/kube-bench-master.yaml | 2 | ||||
-rw-r--r-- | functest_kubernetes/security/kube-bench-node.yaml | 2 | ||||
-rw-r--r-- | functest_kubernetes/security/kube-hunter.yaml | 2 | ||||
-rw-r--r-- | tox.ini | 4 |
16 files changed, 70 insertions, 58 deletions
@@ -22,7 +22,8 @@ datacenters as the lowest cost (50 euros hardware and software included). | v1.24 | v1.24 | | v1.25 | v1.25 | | v1.26 | v1.26 | -| **Master** | **v1.27.0-alpha.0 (rolling)** | +| **v1.27** | **v1.27** | +| Master | v1.30.0-alpha.0 (rolling) | ## Prepare your environment @@ -36,7 +37,7 @@ DEPLOY_SCENARIO=k8s-XXX ```bash sudo docker run --env-file env \ -v $(pwd)/config:/home/xtesting/.kube/config \ - opnfv/functest-kubernetes-healthcheck + opnfv/functest-kubernetes-healthcheck:v1.27 ``` ``` @@ -53,7 +54,7 @@ sudo docker run --env-file env \ ```bash sudo docker run --env-file env \ -v $(pwd)/config:/home/xtesting/.kube/config \ - opnfv/functest-kubernetes-smoke + opnfv/functest-kubernetes-smoke:v1.27 ``` ``` @@ -83,7 +84,7 @@ sudo docker run --env-file env \ ```bash sudo docker run --env-file env \ -v $(pwd)/config:/home/xtesting/.kube/config \ - opnfv/functest-kubernetes-security + opnfv/functest-kubernetes-security:v1.27 ``` ``` @@ -101,7 +102,7 @@ sudo docker run --env-file env \ ```bash sudo docker run --env-file env \ -v $(pwd)/config:/home/xtesting/.kube/config \ - opnfv/functest-kubernetes-benchmarking + opnfv/functest-kubernetes-benchmarking:v1.27 ``` ``` @@ -118,7 +119,7 @@ sudo docker run --env-file env \ ```bash sudo docker run --env-file env \ -v $(pwd)/config:/home/xtesting/.kube/config \ - opnfv/functest-kubernetes-cnf + opnfv/functest-kubernetes-cnf:v1.27 ``` ``` diff --git a/ansible/site.cntt.yml b/ansible/site.cntt.yml index f9bbef36..8b565bff 100644 --- a/ansible/site.cntt.yml +++ b/ansible/site.cntt.yml @@ -4,6 +4,9 @@ - role: collivier.xtesting project: functest-kubernetes db_project: functest + docker_tags: + - v1.27: + branch: stable/v1.27 suites: - container: functest-kubernetes-healthcheck tests: diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 1cc5683d..db017598 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.27: + branch: stable/v1.27 builds: dependencies: - repo: _ diff --git a/ansible/site.yml b/ansible/site.yml index 7c8ddd7c..a922495f 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.27: + branch: stable/v1.27 suites: - container: functest-kubernetes-healthcheck tests: @@ -15,74 +15,74 @@ 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.27|\ +${repo}/functest-kubernetes-core:amd64-v1.27|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.27|\ +${repo}/functest-kubernetes-healthcheck:amd64-v1.27|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-smoke|\ -${repo}/functest-kubernetes-smoke:amd64-latest|g" {} + + -e "s|opnfv/functest-kubernetes-smoke:v1.27|\ +${repo}/functest-kubernetes-smoke:amd64-v1.27|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.27" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.27" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.27" || true) done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-latest" \ + "${repo}/functest-kubernetes-core:amd64-v1.27" \ alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.16|arm64v8/alpine:3.16|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.27|\ +${repo}/functest-kubernetes-core:arm64-v1.27|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.27|\ +${repo}/functest-kubernetes-healthcheck:arm64-v1.27|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.27|\ +${repo}/functest-kubernetes-smoke:arm64-v1.27|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.27" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.27" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.27" || true) done [ ! -z "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ + (docker rmi "${repo}/functest-kubernetes-core:arm64-v1.27" \ arm64v8/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.16|arm32v7/alpine:3.16|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.27|\ +${repo}/functest-kubernetes-core:arm-v1.27|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.27|\ +${repo}/functest-kubernetes-healthcheck:arm-v1.27|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.27|\ +${repo}/functest-kubernetes-smoke:arm-v1.27|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.27" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm-v1.27" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:arm-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:arm-v1.27" || true) done [ ! -z "${arm_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ + (docker rmi "${repo}/functest-kubernetes-core:arm-v1.27" \ arm32v7/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index d958b565..8bf207a5 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ -FROM opnfv/functest-kubernetes-smoke +FROM opnfv/functest-kubernetes-smoke:v1.27 -ARG NETPERF_TAG=master -ARG PLOTPERF_TAG=master +ARG NETPERF_TAG=1104ce23f6c1758796e88f3c23b050099074cf81 +ARG PLOTPERF_TAG=2455313f4b9581795a8f642243acaad472d91804 USER root COPY plotperf.py.patch /tmp/plotperf.py.patch diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 37cb4691..b79a10a4 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,11 +1,12 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.27 +ARG K8S_TAG=1.27 ARG CNF_TESTSUITE_TAG=v0.34.0 ARG HELM_TAG=v3.3.1 USER root RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.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 9777f199..37e98dd5 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,8 +1,8 @@ FROM alpine:3.16 -ARG BRANCH=master -ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master +ARG BRANCH=stable/v1.27 +ARG OPENSTACK_TAG=stable/2023.1 +ARG OPNFV_TAG=stable/2023.1 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 13ffe449..672de06f 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,8 +1,9 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.27 +ARG K8S_TAG=1.27 USER root RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.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 5ecdc9bd..6d9860e6 100644 --- a/docker/security/Dockerfile +++ b/docker/security/Dockerfile @@ -1,3 +1,3 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.27 COPY testcases.yaml /etc/xtesting/testcases.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 1ae498dc..c93f1bf1 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-healthcheck +FROM opnfv/functest-kubernetes-healthcheck:v1.27 COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/elements/functest-kubernetes/install.d/16-functest-kubernetes b/elements/functest-kubernetes/install.d/16-functest-kubernetes index e2144e76..9c5e00dc 100755 --- a/elements/functest-kubernetes/install.d/16-functest-kubernetes +++ b/elements/functest-kubernetes/install.d/16-functest-kubernetes @@ -1,11 +1,11 @@ #!/bin/bash download-frozen-image-v2.sh /data/docker/functest-kubernetes \ - opnfv/functest-kubernetes-healthcheck:latest \ - opnfv/functest-kubernetes-smoke:latest \ - opnfv/functest-kubernetes-benchmarking:latest \ - opnfv/functest-kubernetes-security:latest \ - opnfv/functest-kubernetes-cnf:latest + opnfv/functest-kubernetes-healthcheck:v1.27 \ + opnfv/functest-kubernetes-smoke:v1.27 \ + opnfv/functest-kubernetes-benchmarking:v1.27 \ + opnfv/functest-kubernetes-security:v1.27 \ + opnfv/functest-kubernetes-cnf:v1.27 git clone https://git.opnfv.org/functest-kubernetes /home/debian/functest-kubernetes chown -R 1000:1000 /home/debian/functest-kubernetes diff --git a/functest_kubernetes/security/kube-bench-master.yaml b/functest_kubernetes/security/kube-bench-master.yaml index ccfc842b..b901bc51 100644 --- a/functest_kubernetes/security/kube-bench-master.yaml +++ b/functest_kubernetes/security/kube-bench-master.yaml @@ -26,7 +26,7 @@ spec: effect: NoSchedule containers: - name: kube-bench - image: {{ dockerhub_repo }}/aquasec/kube-bench:latest + image: {{ dockerhub_repo }}/aquasec/kube-bench:v0.6.10 command: ["kube-bench", "run", "--targets", "master", "--json"] volumeMounts: - name: var-lib-etcd diff --git a/functest_kubernetes/security/kube-bench-node.yaml b/functest_kubernetes/security/kube-bench-node.yaml index 03d428ad..43746a0b 100644 --- a/functest_kubernetes/security/kube-bench-node.yaml +++ b/functest_kubernetes/security/kube-bench-node.yaml @@ -9,7 +9,7 @@ spec: hostPID: true containers: - name: kube-bench - image: {{ dockerhub_repo }}/aquasec/kube-bench:latest + image: {{ dockerhub_repo }}/aquasec/kube-bench:v0.6.10 command: ["kube-bench", "run", "--targets", "node", "--json"] volumeMounts: - name: var-lib-etcd diff --git a/functest_kubernetes/security/kube-hunter.yaml b/functest_kubernetes/security/kube-hunter.yaml index 0b58cab7..d1169618 100644 --- a/functest_kubernetes/security/kube-hunter.yaml +++ b/functest_kubernetes/security/kube-hunter.yaml @@ -7,7 +7,7 @@ spec: spec: containers: - name: kube-hunter - image: {{ dockerhub_repo }}/aquasec/kube-hunter:latest + image: {{ dockerhub_repo }}/aquasec/kube-hunter:0.6.8 command: ["kube-hunter"] args: ["--pod", "--report", "json", "--statistics"] restartPolicy: Never @@ -5,8 +5,8 @@ envlist = pep8,pylint,yamllint,bashate,py310,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/2023.1 + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/2023.1/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} |