aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/cnf/Dockerfile11
-rw-r--r--docker/cnf/testcases.yaml26
2 files changed, 26 insertions, 11 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 97bdf068..644a3b80 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-kubernetes-core:v1.31
ARG K8S_TAG=1.31
-ARG CNF_TESTSUITE_TAG=v1.3.3
+ARG CNF_TESTSUITE_TAG=v1.4.1
ARG HELM_TAG=v3.6.0
USER root
@@ -26,17 +26,12 @@ RUN apk --no-cache add --update wget curl ncurses git yaml openssl zlib && \
(cd /src/cnf-testsuite && \
git fetch --tags https://github.com/cnti-testcatalog/testsuite.git $CNF_TESTSUITE_TAG && \
git checkout FETCH_HEAD && \
- wget https://patch-diff.githubusercontent.com/raw/cnti-testcatalog/testsuite/pull/2156.diff && \
- patch -p1 < 2156.diff && rm 2156.diff && \
- shards install && \
+ shards install --without-development && \
crystal build --static src/cnf-testsuite.cr && \
- cp cnf-testsuite /usr/local/bin/cnf-testsuite && rm -r lib) && \
+ mv cnf-testsuite /usr/local/bin/cnf-testsuite && rm -r lib) && \
chown -R xtesting: /src/cnf-testsuite && \
- 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 && \
rm -rf /src/cnf-testsuite/.git ;; esac && \
apk del .build-deps
USER xtesting
-RUN helm repo add stable https://cncf.gitlab.io/stable
COPY testcases.yaml /etc/xtesting/testcases.yaml
CMD ["run_tests", "-t", "all"]
diff --git a/docker/cnf/testcases.yaml b/docker/cnf/testcases.yaml
index 30b6b664..704f2e9d 100644
--- a/docker/cnf/testcases.yaml
+++ b/docker/cnf/testcases.yaml
@@ -30,14 +30,34 @@ tiers:
- case_name: cnf_testsuite
project_name: functest
- # https://github.com/cncf/cnf-certification/blob/main/reviewing.md
- criteria: 10
+ # https://github.com/lfn-cnti/certification/blob/main/docs/CNTiCertification-2.0-beta.md
+ # V2.0-beta certification requires passing at least 15 of
+ # the 19 total Essential tests.
+ criteria: 15
blocking: false
description: >-
Enable interoperability of Cloud native Network
Functions (CNFs) as proposed by
- https://github.com/cncf/cnf-testsuite
+ https://github.com/cnti-testcatalog/testsuite
dependencies:
- DEPLOY_SCENARIO: "k8-*"
run:
name: cnf_testsuite
+ args:
+ cnf-config: example-cnfs/coredns/cnf-testsuite.yml
+ tag: cert
+ - case_name: cnf_testsuite_workload
+ project_name: functest
+ criteria: 50
+ blocking: false
+ description: >-
+ Enable interoperability of Cloud native Network
+ Functions (CNFs) as proposed by
+ https://github.com/cnti-testcatalog/testsuite
+ dependencies:
+ - DEPLOY_SCENARIO: "k8-*"
+ run:
+ name: cnf_testsuite
+ args:
+ cnf-config: example-cnfs/coredns/cnf-testsuite.yml
+ tag: workload