From a4f494545599f29c8ee9b458d8fb6593ccc0c0ea Mon Sep 17 00:00:00 2001 From: monopole Date: Sun, 2 May 2021 13:01:24 -0700 Subject: [PATCH] Run e2e tests against 4.1.2 --- Makefile | 8 ++++---- hack/testExamplesAgainstKustomize.sh | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 798095cdd..301759a94 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ verify-kustomize: \ lint-kustomize \ test-unit-kustomize-all \ test-examples-kustomize-against-HEAD \ - test-examples-kustomize-against-4.0 + test-examples-kustomize-against-4.1 # The following target referenced by a file in # https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize @@ -41,7 +41,7 @@ prow-presubmit-check: \ test-unit-cmd-all \ test-go-mod \ test-examples-kustomize-against-HEAD \ - test-examples-kustomize-against-4.0 + test-examples-kustomize-against-4.1 .PHONY: verify-kustomize-e2e verify-kustomize-e2e: test-examples-e2e-kustomize @@ -284,8 +284,8 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip ./hack/testExamplesAgainstKustomize.sh HEAD .PHONY: -test-examples-kustomize-against-4.0: $(MYGOBIN)/mdrip - ./hack/testExamplesAgainstKustomize.sh v4@v4.0.5 +test-examples-kustomize-against-4.1: $(MYGOBIN)/mdrip + ./hack/testExamplesAgainstKustomize.sh v4@v4.1.2 # linux only. # This is for testing an example plugin that diff --git a/hack/testExamplesAgainstKustomize.sh b/hack/testExamplesAgainstKustomize.sh index 1e4789408..e8db00a67 100755 --- a/hack/testExamplesAgainstKustomize.sh +++ b/hack/testExamplesAgainstKustomize.sh @@ -35,11 +35,8 @@ mdrip --mode test --blockTimeOut 15m \ # TODO: make work for non-linux if onLinuxAndNotOnRemoteCI; then echo "On linux, and not on remote CI. Running expensive tests." - # TODO: remove the HEAD check once --enable-helm flag released. - if [ "$version" == "HEAD" ]; then - make $MYGOBIN/helmV3 - mdrip --mode test --label testHelm examples/chart.md - fi + make $MYGOBIN/helmV3 + mdrip --mode test --label testHelm examples/chart.md fi # Force outside logic to rebuild kustomize rather than