diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcde43e4695f7be42d55e5238753c25e2ba5e548..b276d3e556ee9a772011750ffb195c853552a389 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -561,6 +561,7 @@ test-chart-integration: script: - pip3 install kubetest kubernetes==17.17.0 - helm version + - kubectl config view > tests/chart-integration-tests/KUBECONFIG - make chart_integration_test CAR_OCI_REGISTRY_HOST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME} test-chart: diff --git a/Makefile b/Makefile index ab98b560806a44cec501dd589b10ce24550d3e9a..1d1420b007b166d53ad8f3b26ea5548a547df8d5 100644 --- a/Makefile +++ b/Makefile @@ -231,7 +231,7 @@ chart_integration_test: #helm-pre-publish #clean dep-up cd charts/ska-tango-base && bash ./values.yaml.sh; cd -;\ helm package charts/ska-tango-util/ -d charts/ska-tango-base/charts/; \ cd charts/ska-tango-base/; helm template -s templates/tangodb.yaml . -n test > gen_tangodb.yaml; sed -i 's/-dirty//g' gen_tangodb.yaml;cd -;\ - cd tests/chart-integration-tests/; pytest -s . --kube-config=/builds/U4A3yYGS/0/ska-telescope/ska-tango-images.tmp/KUBECONFIG; \ + cd tests/chart-integration-tests/; pytest -s . --kube-config=KUBECONFIG; \ wait: ## wait for pods to be ready @echo "Waiting for pods to be ready"