Change test skips based on environment variable

Author: travisyx

Diff for: test/e2e/tests/setup_e2e_test.go

@@ -49,7 +49,6 @@ var (
 	cloudtopHost              = flag.Bool("cloudtop-host", false, "The local host is cloudtop, a kind of googler machine with special requirements to access GCP")
 	extraDriverFlags          = flag.String("extra-driver-flags", "", "Extra flags to pass to the driver")
 	enableConfidentialCompute = flag.Bool("enable-confidential-compute", false, "Create VMs with confidential compute mode. This uses NVMe devices")
-	gitTag                    = flag.String("git-tag", "", "The most recent tag relative to the current commit. Used to generate test skips.")
 
 	testContexts        = []*remote.TestContext{}
 	computeService      *compute.Service

Diff for: test/e2e/tests/single_zone_e2e_test.go

@@ -17,6 +17,7 @@ package tests
 import (
 	"context"
 	"fmt"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -1571,9 +1572,8 @@ var _ = Describe("GCE PD CSI Driver", func() {
 			updatedIops *string,
 			updatedThroughput *string,
 		) {
-			// ControllerModifyVolume is introduced in v1.15.0, so skip tests otherwise
-			if len(*gitTag) == 0 || *gitTag < "v1.15.0" {
-				Skip("Not running ControllerModifyVolume tests, as the current git tag is below v1.15.0.")
+			if !runCMVTests() {
+				Skip("Not running ControllerModifyVolume tests, as RUN_CONTROLLER_MODIFY_VOLUME_TESTS is falsy")
 			}
 			Expect(testContexts).ToNot(BeEmpty())
 			testContext := getRandomTestContext()
@@ -1896,6 +1896,20 @@ func merge(a, b map[string]string) map[string]string {
 	return res
 }
 
+func runCMVTests() bool {
+	runCMVStr, ok := os.LookupEnv("RUN_CONTROLLER_MODIFY_VOLUME_TESTS")
+	if !ok {
+		return false
+	}
+
+	runCMVTests, err := strconv.ParseBool(runCMVStr)
+	if err != nil {
+		return false
+	}
+
+	return runCMVTests
+}
+
 func stringPtr(str string) *string {
 	return &str
 }

Diff for: test/run-e2e-local.sh

@@ -16,10 +16,4 @@ if hostname | grep -q c.googlers.com ; then
   CLOUDTOP_HOST=--cloudtop-host
 fi
 
-GIT_TAG=
-if $(command -v git > /dev/null); then
-  # Get the most recent tag version relative to the current state
-  GIT_TAG=$(git describe --abbrev=0 --tags)
-fi
-
-ginkgo --v "test/e2e/tests" -- --project "${PROJECT}" --service-account "${IAM_NAME}" "${CLOUDTOP_HOST}" --git-tag "${GIT_TAG}" --v=6 --logtostderr $@
+ginkgo --v "test/e2e/tests" -- --project "${PROJECT}" --service-account "${IAM_NAME}" "${CLOUDTOP_HOST}" --v=6 --logtostderr $@

Diff for: test/run-e2e.sh

@@ -5,4 +5,9 @@ set -x
 
 readonly PKGDIR=sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 
-go test --timeout 45m --v "${PKGDIR}/test/e2e/tests" --run-in-prow=true --delete-instances=true --logtostderr $@
+TIMEOUT=30m
+if [ "$RUN_CONTROLLER_MODIFY_VOLUME_TESTS" = true ]; then
+    TIMEOUT=45m
+fi
+
+go test --timeout "${TIMEOUT}" --v "${PKGDIR}/test/e2e/tests" --run-in-prow=true --delete-instances=true --logtostderr $@