Prepare Functest K8s v1.33

Change-Id: If4ad9a973cedee82cb9a68e2e98ad5e4e8a9aa7f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/.gitreview b/.gitreview
index 84c0d55..c39ed37 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=gerrit.opnfv.org
 port=29418
 project=functest-kubernetes.git
+defaultbranch=stable/v1.33

diff --git a/README.md b/README.md
index fe2df66..e54354e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -21,7 +21,9 @@ datacenters as the lowest cost (50 euros hardware and software included).
 | v1.29             | v1.29               |
 | v1.30             | v1.30               |
 | v1.31             | v1.31               |
-| **Master**        | **latest**          |
+| v1.32             | v1.32               |
+| **v1.33**         | **v1.33**           |
+| Master            | latest              |
 
 ## Prepare your environment
 
@@ -35,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.33
 ```
 
 ```
@@ -52,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.33
 ```
 
 ```
@@ -82,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.33
 ```
 
 ```
@@ -100,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.33
 ```
 
 ```
@@ -117,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.33
 ```
 
 ```
@@ -208,7 +210,7 @@ sudo docker run \
     -v $(pwd)/config:/home/xtesting/.kube/config \
     -v $(pwd)/envoy:/src/envoy \
     -v $(pwd)/testcases.yaml:/etc/xtesting/testcases.yaml \
-    opnfv/functest-kubernetes-cnf
+    opnfv/functest-kubernetes-cnf:v1.33
 ```
 
 ```

diff --git a/ansible/site.cntt.yml b/ansible/site.cntt.yml
index f9bbef3..5471410 100644 (file)
--- 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.33:
+            branch: stable/v1.33
       suites:
         - container: functest-kubernetes-healthcheck
           tests:

diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index fdab6d0..c43846b 100644 (file)
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -8,8 +8,8 @@
       gerrit_project: functest-kubernetes
       git_url: https://gerrit.opnfv.org/gerrit/functest-kubernetes
       docker_tags:
-        - latest:
-            branch: master
+        - v1.33:
+            branch: stable/v1.33
             dependency: '3.21'
       builds:
         dependency:

diff --git a/ansible/site.yml b/ansible/site.yml
index 7c8ddd7..05a8dc9 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -4,6 +4,9 @@
     - role: collivier.xtesting
       project: functest-kubernetes
       db_project: functest
+      docker_tags:
+        - v1.33:
+            branch: stable/v1.33
       suites:
         - container: functest-kubernetes-healthcheck
           tests:

diff --git a/build.sh b/build.sh
index f7a62a1..e66906b 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -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.33|\
+${repo}/functest-kubernetes-core:amd64-v1.33|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.33|\
+${repo}/functest-kubernetes-healthcheck:amd64-v1.33|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.33|\
+${repo}/functest-kubernetes-smoke:amd64-v1.33|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.33" .)
+        docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.33"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:amd64-v1.33" || true)
 done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
-        "${repo}/functest-kubernetes-core:amd64-latest" \
+        "${repo}/functest-kubernetes-core:amd64-v1.33" \
         alpine:3.21 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
     -e "s|alpine:3.21|arm64v8/alpine:3.21|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.33|\
+${repo}/functest-kubernetes-core:arm64-v1.33|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.33|\
+${repo}/functest-kubernetes-healthcheck:arm64-v1.33|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.33|\
+${repo}/functest-kubernetes-smoke:arm64-v1.33|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.33" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.33"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:arm64-v1.33" || true)
 done
 [ ! -z "${arm64_dirs}" ] &&
-    (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
+    (docker rmi "${repo}/functest-kubernetes-core:arm64-v1.33" \
         arm64v8/alpine:3.21 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
     -e "s|alpine:3.21|arm32v7/alpine:3.21|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.33|\
+${repo}/functest-kubernetes-core:arm-v1.33|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.33|\
+${repo}/functest-kubernetes-healthcheck:arm-v1.33|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.33|\
+${repo}/functest-kubernetes-smoke:arm-v1.33|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.33" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm-v1.33"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:arm-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:arm-v1.33" || true)
 done
 [ ! -z "${arm_dirs}" ] &&
-    (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \
+    (docker rmi "${repo}/functest-kubernetes-core:arm-v1.33" \
         arm32v7/alpine:3.21 || true)
 find . -name Dockerfile -exec git checkout {} +
 

diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 4ae6450..6300a2a 100644 (file)
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-smoke
+FROM opnfv/functest-kubernetes-smoke:v1.33
 
 ARG NETPERF_TAG=1104ce23f6c1758796e88f3c23b050099074cf81
 ARG PLOTPERF_TAG=2455313f4b9581795a8f642243acaad472d91804

diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index a780bc7..d30700d 100644 (file)
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,12 +1,13 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.33
 
+ARG K8S_TAG=1.33
 ARG CNF_TESTSUITE_TAG=v1.4.3
 ARG HELM_TAG=v3.17.0
 
 USER root
 RUN apk --no-cache add --update wget curl ncurses git yaml openssl zlib && \
     apk --no-cache add --virtual .build-deps --update crystal shards make yaml-dev openssl-dev zlib-dev patch openssl-libs-static yaml-static zlib-static && \
-    tag=$(curl -Ls https://dl.k8s.io/release/latest.txt) && \
+    tag=$(curl -Ls https://dl.k8s.io/release/stable-$K8S_TAG.txt) && \
     case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \
     curl -Ls https://dl.k8s.io/release/$tag/bin/linux/$arch/kubectl \
         --output /usr/local/bin/kubectl && \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index bc5492b..37be640 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.21
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/v1.33
+ARG OPENSTACK_TAG=stable/2025.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
@@ -28,6 +28,10 @@ RUN apk -U upgrade && \
         -c/src/functest-kubernetes/upper-constraints.txt \
         -c/src/requirements/upper-constraints.txt \
         setuptools_scm && \
+    CFLAGS="-Wno-int-conversion -Wno-sign-compare" pip3 install --break-system-packages --use-deprecated=legacy-resolver --no-cache-dir --src /src \
+        -c/src/functest-kubernetes/upper-constraints.txt \
+        -c/src/requirements/upper-constraints.txt \
+        netifaces && \
     pip3 install --break-system-packages --use-deprecated=legacy-resolver --no-cache-dir --src /src \
         -c/src/functest-kubernetes/upper-constraints.txt \
         -c/src/requirements/upper-constraints.txt \

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 0ab3217..dc8727e 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,8 +1,9 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.33
 
+ARG K8S_TAG=1.33
 USER root
 RUN apk --no-cache add --update curl libc6-compat && \
-    tag=$(curl -Ls https://dl.k8s.io/release/latest.txt) && \
+    tag=$(curl -Ls https://dl.k8s.io/release/stable-$K8S_TAG.txt) && \
     case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \
     curl -Ls https://dl.k8s.io/release/$tag/bin/linux/$arch/kubectl \
         --output /usr/local/bin/kubectl && \

diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile
index 5ecdc9b..2056400 100644 (file)
--- a/docker/security/Dockerfile
+++ b/docker/security/Dockerfile
@@ -1,3 +1,3 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:v1.33
 
 COPY testcases.yaml /etc/xtesting/testcases.yaml

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 1ae498d..aec9592 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:v1.33
 
 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 e2144e7..aa20dc5 100755 (executable)
--- a/elements/functest-kubernetes/install.d/16-functest-kubernetes
+++ b/elements/functest-kubernetes/install.d/16-functest-kubernetes
@@ -1,12 +1,15 @@
 #!/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
-git clone https://git.opnfv.org/functest-kubernetes /home/debian/functest-kubernetes
+  opnfv/functest-kubernetes-healthcheck:v1.33 \
+  opnfv/functest-kubernetes-smoke:v1.33 \
+  opnfv/functest-kubernetes-benchmarking:v1.33 \
+  opnfv/functest-kubernetes-security:v1.33 \
+  opnfv/functest-kubernetes-cnf:v1.33
+git init /home/debian/functest-kubernetes && \
+(cd /home/debian/functest-kubernetes && \
+  git fetch --tags https://git.opnfv.org/functest-kubernetes stable/v1.33 && \
+  git checkout FETCH_HEAD) && \
 chown -R 1000:1000 /home/debian/functest-kubernetes
 
 exit 0

diff --git a/functest_kubernetes/security/kube-bench-master.yaml b/functest_kubernetes/security/kube-bench-master.yaml
index ccfc842..6b70416 100644 (file)
--- 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.10.0
           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 03d428a..920eeeb 100644 (file)
--- 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.10.0
           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 0b58cab..d116961 100644 (file)
--- 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

diff --git a/tox.ini b/tox.ini
index 99fd41b..7853c1b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = pep8,pylint,yamllint,bashate,py312,bandit,perm
 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/2024.2/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install --use-deprecated=legacy-resolver {opts} {packages}

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 0f6b28f..463df5a 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -1,7 +1,7 @@
 xtesting===1.0.0
 bandit===1.8.2
--e git+https://opendev.org/openstack/rally.git#egg=rally
-git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes
+-e git+https://opendev.org/openstack/rally.git@4.1.0#egg=rally
+git+https://github.com/xrally/xrally-kubernetes.git@8dc042b36dddcfc264ee95b6f4b61a10f4a8d845#egg=xrally-kubernetes
 pylint===3.3.3
 flake8===7.1.1
 pytest===8.3.4