From 5d1eb2274bc28b77d761e0ce89bb3c3f2a47d787 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 30 Sep 2022 11:30:05 +0200 Subject: Get the right K8s e2e version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4eaba8b410061e4d401319a020770d78b6990a85 Signed-off-by: Cédric Ollivier --- docker/cnf/Dockerfile | 3 ++- docker/healthcheck/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 21a97d0b..c16bf24f 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,10 +1,11 @@ FROM opnfv/functest-kubernetes-core:v1.24 +ARG K8S_TAG=1.24 ARG CNF_TESTSUITE_TAG=v0.15.0 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.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/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 7f8c1009..de8381dd 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,7 +1,8 @@ FROM opnfv/functest-kubernetes-core:v1.24 +ARG K8S_TAG=1.24 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 && \ -- cgit 1.2.3-korg