From bca84b0ea65ed12e69430bc9f8346a762039754e Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 18 Apr 2024 14:08:13 +0200 Subject: Leverage the new CNF TestSuite repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8cba2f8cf510a93efdbc110a288fc5bf99c5143e Signed-off-by: Cédric Ollivier (cherry picked from commit 345d7a172c8f5556e58f645bb03eec436e86d999) --- docker/cnf/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index b833e725..ac0a34b9 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-kubernetes-core:v1.27 ARG K8S_TAG=1.27 -ARG CNF_TESTSUITE_TAG=v0.45.0 +ARG CNF_TESTSUITE_TAG=v1.0.0 ARG HELM_TAG=v3.3.1 USER root @@ -17,14 +17,14 @@ RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ chmod +x /usr/local/bin/kubectl /usr/local/bin/helm && \ rm -r /src/helm-$HELM_TAG-linux-$arch.tar.gz /src/linux-$arch && \ case $(uname -m) in x86_64) \ - curl https://github.com/cncf/cnf-testsuite/releases/download/$CNF_TESTSUITE_TAG/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz \ + curl https://github.com/cnti-testcatalog/testsuite/releases/download/$CNF_TESTSUITE_TAG/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz \ -L --output /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz && \ - tar zxf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz ./cnf-testsuite -C /usr/local/bin && \ + tar zxf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz cnf-testsuite -C /usr/local/bin && \ chmod +x /usr/local/bin/cnf-testsuite && \ mkdir /src/cnf-testsuite && \ git init /src/cnf-testsuite && \ (cd /src/cnf-testsuite && \ - git fetch --tags https://github.com/cncf/cnf-testsuite.git $CNF_TESTSUITE_TAG && \ + git fetch --tags https://github.com/cnti-testcatalog/testsuite.git $CNF_TESTSUITE_TAG && \ git checkout FETCH_HEAD) && \ chown -R xtesting: /src/cnf-testsuite && \ ln -s /src/cnf-testsuite/example-cnfs/coredns/cnf-testsuite.yml /src/cnf-testsuite/cnf-testsuite.yml && \ -- cgit 1.2.3-korg