diff --git a/Jenkinsfile b/Jenkinsfile index 99a57d1707c4303cae37ec8196cc61903568ed12..736938b6bd6619d320c94ecc9ba2e6503aa6d4fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -155,7 +155,7 @@ pipeline { dir('src/main/helm') { sh "helm lint -f ../../test/unit-values.yaml" - sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ." + sh "helm unittest --helm3 -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ." sh "helm package --version=${HELM_CHART_VERSION} ." diff --git a/run_helm_test.sh b/run_helm_test.sh new file mode 100755 index 0000000000000000000000000000000000000000..7324e7d118cdd0dd4d8815201c07089ea5122d12 --- /dev/null +++ b/run_helm_test.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +helm template ./src/main/helm/ -f src/test/unit-values.yaml +helm lint -f src/test/unit-values.yaml ./src/main/helm/ +cd src/main/helm && helm unittest --helm3 -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' . \ No newline at end of file diff --git a/src/test/helm/ingress_nginx_cors_test.yaml b/src/test/helm/ingress_nginx_cors_test.yaml index 9a0531a7841d8425095c0f41323d4321056cb7b9..aa255265aeb87cb0da6f7c01915fed1fa92b1448 100644 --- a/src/test/helm/ingress_nginx_cors_test.yaml +++ b/src/test/helm/ingress_nginx_cors_test.yaml @@ -39,5 +39,4 @@ tests: more_set_headers "Access-Control-Allow-Methods: GET,PATCH,OPTIONS"; more_set_headers "Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,X-XSRF-TOKEN"; more_set_headers "Access-Control-Expose-Headers: Content-Length,Content-Range"; - more_set_headers "Access-Control-Allow-Origin: https://helm.test.sh.ozg-cloud.de";