diff --git a/Makefile b/Makefile index 50b28f1058..133e7b0664 100644 --- a/Makefile +++ b/Makefile @@ -206,12 +206,11 @@ test-e2e-external-eks: .PHONY: test-helm-chart test-helm-chart: - echo "temporarily disabled" - #AWS_REGION=us-west-2 \ - #AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \ - #EBS_INSTALL_SNAPSHOT="true" \ - #HELM_CT_TEST="true" \ - #./hack/e2e/run.sh + AWS_REGION=us-west-2 \ + AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \ + EBS_INSTALL_SNAPSHOT="true" \ + HELM_CT_TEST="true" \ + ./hack/e2e/run.sh .PHONY: verify-vendor test: verify-vendor diff --git a/hack/e2e/run.sh b/hack/e2e/run.sh index 9c656c2793..9981e06cc0 100755 --- a/hack/e2e/run.sh +++ b/hack/e2e/run.sh @@ -175,6 +175,14 @@ fi if [[ "${HELM_CT_TEST}" == true ]]; then loudecho "Test and lint Helm chart with chart-testing" + if [ -n "${PROW_JOB_ID:-}" ]; then + # Prow-specific setup + # Required becuase chart_testing ALWAYS needs a remote + git remote add ct https://github.com/kubernetes-sigs/aws-ebs-csi-driver.git + git fetch ct "${PULL_BASE_REF}" + export CT_REMOTE="ct" + export CT_TARGET_BRANCH="${PULL_BASE_REF}" + fi set -x set +e export KUBECONFIG="${KUBECONFIG}" diff --git a/tests/ct-config.yaml b/tests/ct-config.yaml index f90cf0d128..591fcd502f 100644 --- a/tests/ct-config.yaml +++ b/tests/ct-config.yaml @@ -1,9 +1,6 @@ -remote: origin -since: HEAD~1 -github-instance: https://github.com -lint-conf: tests/ct-lintconfig.yaml validate-chart-schema: false validate-yaml: false +validate-maintainers: false check-version-increment: false charts: - charts/aws-ebs-csi-driver @@ -15,4 +12,3 @@ release-label: release kubectl-timeout: 3000s skip-clean-up: false print-logs: true -debug: false