diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2024-01-17 16:02:32 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2024-01-17 17:33:40 +0100 |
| commit | 1072e17aba4ba037500412858a2b589d1b88e2de (patch) | |
| tree | 614379997c7e482f5b85c9b4c46b77fdfaa6222f /docker | |
| parent | 9cb990f8f874f395fe6aa7f045fa9dcc3fdb35c4 (diff) | |
Prepare Functest K8S v1.29
Change-Id: I65573ef010021e310278aa9611d05b42a8616b3b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -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 |
6 files changed, 14 insertions, 12 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index d958b565..f7bc22cc 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ -FROM opnfv/functest-kubernetes-smoke +FROM opnfv/functest-kubernetes-smoke:v1.29 -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 9c9553e7..c2cc0a84 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,11 +1,12 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.29 +ARG K8S_TAG=1.29 ARG CNF_TESTSUITE_TAG=v0.45.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-1.29.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 e935d426..a514c6c5 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.29 +ARG OPENSTACK_TAG=stable/zed +ARG OPNFV_TAG=stable/zed 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 dce2966d..7c7b728e 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,8 +1,9 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.29 +ARG K8S_TAG=1.29 USER root RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-1.29.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..ec0f334b 100644 --- a/docker/security/Dockerfile +++ b/docker/security/Dockerfile @@ -1,3 +1,3 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:v1.29 COPY testcases.yaml /etc/xtesting/testcases.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 1ae498dc..2c770401 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-healthcheck +FROM opnfv/functest-kubernetes-healthcheck:v1.29 COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] |