aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-05-25 06:54:22 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-05-25 11:43:11 +0200
commit6c159a1dab526cd5af89e413707e21508392d4cd (patch)
treedf535af42daaaeeee26b9b66d7a953269bbf520b /docker
parent1c376f363a95d040676ea3f245e55ac3f40710a4 (diff)
Update cnf_testsuite to v0.11.2
https://github.com/cncf/cnf-testsuite/releases/tag/v0.11.2 Change-Id: Id3a5ea98260859f7fe5aba6ecf02d09905610dda Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c35c6d443eb93db318c3436d995809dfe7e8389f)
Diffstat (limited to 'docker')
-rw-r--r--docker/cnf/Dockerfile18
1 files changed, 8 insertions, 10 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 6b612db6..b4f905ab 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-kubernetes-core:leguer
ARG K8S_TAG=1.20
-ARG CNF_TESTSUITE_TAG=v0.11.0
+ARG CNF_TESTSUITE_TAG=v0.11.2
ARG HELM_TAG=v3.3.1
RUN apk --no-cache add --update wget curl libc6-compat ncurses && \
@@ -21,15 +21,13 @@ RUN apk --no-cache add --update wget curl libc6-compat ncurses && \
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 && \
- curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/example-cnfs/coredns/cnf-conformance.yml \
- --output /src/cnf-testsuite/cnf-conformance.yml && \
- curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/points.yml \
- --output /src/cnf-testsuite/points.yml && \
- mkdir -p /src/cnf-testsuite/spec/fixtures && \
- for yml in chaos_network_loss.yml chaos_cpu_hog.yml chaos_container_kill.yml; do \
- curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/spec/fixtures/$yml \
- --output /src/cnf-testsuite/spec/fixtures/$yml; done && \
+ git init /src/cnf-testsuite && \
+ (cd /src/cnf-testsuite && \
+ git fetch --tags https://github.com/cncf/cnf-testsuite.git $CNF_TESTSUITE_TAG && \
+ git checkout FETCH_HEAD) && \
+ ln -s /src/cnf-testsuite/example-cnfs/coredns/cnf-testsuite.yml /src/cnf-testsuite/cnf-testsuite.yml && \
+ ln -s /src/cnf-testsuite/points-all.yml /src/cnf-testsuite/points.yml && \
helm repo add stable https://cncf.gitlab.io/stable && \
- rm /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz ;; esac
+ rm -rf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz /src/cnf-testsuite/.git ;; esac
COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]