diff options
author | 2020-09-15 23:18:16 +0200 | |
---|---|---|
committer | 2020-09-16 10:36:35 +0200 | |
commit | 8ce58135399768813a4fa49b3ce72de84b58f6ba (patch) | |
tree | 3b90f0e986803aa275c85dc2fd4f15fbed683d74 /docker | |
parent | d07993e69dcc89acd097599438433bdf5d78cae7 (diff) |
Publish helm_vims also based on clearwater-docker
It leverages helm rather than kubectl as proposed by k8s_vims.
A new abstract class Vims is added to factorize code between both
testcases.
Change-Id: Ie5de8d62e25e74f73f8e32167228a08e82989abd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 32dfc10f56ead9abea8798e1ce16fe87652ca480)
Diffstat (limited to 'docker')
-rw-r--r-- | docker/cnf/Dockerfile | 8 | ||||
-rw-r--r-- | docker/cnf/testcases.yaml | 30 |
2 files changed, 29 insertions, 9 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index c2288680..b0461ad4 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -2,6 +2,7 @@ FROM opnfv/functest-kubernetes-core:hunter ARG K8S_TAG=v1.13.12 ARG CNF_CONFORMANCE_TAG=v0.7.2-beta1 +ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ apk --no-cache add --virtual .build-deps --update make rsync findutils gcc musl-dev && \ @@ -12,7 +13,12 @@ RUN apk --no-cache add --update wget curl libc6-compat && \ git checkout FETCH_HEAD && \ make kubectl && \ mv _output/bin/* /usr/local/bin) && \ - rm -r /src/k8s.io && \ + curl https://get.helm.sh/helm-$HELM_TAG-linux-$ARCH.tar.gz \ + -s --output /src/helm-$HELM_TAG-linux-$ARCH.tar.gz && \ + tar zxf /src/helm-$HELM_TAG-linux-$ARCH.tar.gz linux-$ARCH/helm -C /src && \ + mv /src/linux-$ARCH/helm /usr/local/bin && \ + chmod +x /usr/local/bin/kubectl /usr/local/bin/helm && \ + rm -r /src/k8s.io /src/helm-$HELM_TAG-linux-$ARCH.tar.gz /src/linux-$ARCH && \ case $(uname -m) in x86_64) \ curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$(echo $CNF_CONFORMANCE_TAG |cut -d\- -f 1)-$ARCH-static \ -Ls --output /usr/local/bin/cnf-conformance && \ diff --git a/docker/cnf/testcases.yaml b/docker/cnf/testcases.yaml index f122d066..71dce987 100644 --- a/docker/cnf/testcases.yaml +++ b/docker/cnf/testcases.yaml @@ -6,20 +6,20 @@ tiers: Collection of VNF test cases. testcases: - - case_name: cnf_conformance + case_name: k8s_vims project_name: functest - criteria: 75 + criteria: 100 blocking: false description: >- - Enable interoperability of Cloud native Network - Functions (CNFs) as proposed by - https://github.com/cncf/cnf-conformance + Deploy and test Clearwater IMS using Kubernetes as proposed + by https://github.com/Metaswitch/clearwater-docker dependencies: - DEPLOY_SCENARIO: 'k8-*' run: - name: cnf_conformance + name: k8s_vims + - - case_name: k8s_vims + case_name: helm_vims project_name: functest criteria: 100 blocking: false @@ -29,4 +29,18 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'k8-*' run: - name: k8s_vims + name: helm_vims + + - + case_name: cnf_conformance + project_name: functest + criteria: 75 + blocking: false + description: >- + Enable interoperability of Cloud native Network + Functions (CNFs) as proposed by + https://github.com/cncf/cnf-conformance + dependencies: + - DEPLOY_SCENARIO: 'k8-*' + run: + name: cnf_conformance |