Skip to content

Commit

Permalink
Merge pull request #1473 from ConnorJC3/chart-tester-fix
Browse files Browse the repository at this point in the history
Fix chart testing for CI
  • Loading branch information
k8s-ci-robot authored Jan 10, 2023
2 parents c6ea44a + 9fba69a commit 7106b0c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions hack/e2e/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
6 changes: 1 addition & 5 deletions tests/ct-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -15,4 +12,3 @@ release-label: release
kubectl-timeout: 3000s
skip-clean-up: false
print-logs: true
debug: false

0 comments on commit 7106b0c

Please sign in to comment.