Skip headroom tests

Author: yerzhan7

tests/e2e-kubernetes/e2e_test.go

@@ -24,6 +24,7 @@ func init() {
 	flag.StringVar(&CommitId, "commit-id", "local", "commit id will be used to name buckets")
 	flag.StringVar(&BucketRegion, "bucket-region", "us-east-1", "region where temporary buckets will be created")
 	flag.StringVar(&ClusterName, "cluster-name", "", "name of the cluster")
+	flag.StringVar(&ClusterType, "cluster-type", "eksctl", "type of cluster (eksctl or openshift)")
 	flag.StringVar(&BucketPrefix, "bucket-prefix", "local", "prefix for temporary buckets")
 	flag.BoolVar(&Performance, "performance", false, "run performance tests")
 	flag.BoolVar(&UpgradeTests, "run-upgrade-tests", false, "run upgrade tests")
@@ -65,22 +66,33 @@ var CSITestSuites = []func() framework.TestSuite{
 	custom_testsuites.InitS3CSICredentialsTestSuite,
 	custom_testsuites.InitS3CSICacheTestSuite,
 	custom_testsuites.InitS3CSIPodSharingTestSuite,
-	custom_testsuites.InitS3HeadroomTestSuite,
 	custom_testsuites.InitS3TaintRemovalTestSuite,
 }
 
+func getCSITestSuites() []func() framework.TestSuite {
+	suites := CSITestSuites
+	// Headroom feature is not supported on OpenShift
+	if ClusterType != "openshift" {
+		suites = append(suites, custom_testsuites.InitS3HeadroomTestSuite)
+	}
+	return suites
+}
+
 // This executes testSuites for csi volumes.
 var _ = utils.SIGDescribe("CSI Volumes", func() {
+	var testSuites []func() framework.TestSuite
 	if Performance {
-		CSITestSuites = []func() framework.TestSuite{custom_testsuites.InitS3CSIPerformanceTestSuite}
+		testSuites = []func() framework.TestSuite{custom_testsuites.InitS3CSIPerformanceTestSuite}
 	} else if UpgradeTests {
-		CSITestSuites = []func() framework.TestSuite{custom_testsuites.InitS3CSIUpgradeTestSuite}
+		testSuites = []func() framework.TestSuite{custom_testsuites.InitS3CSIUpgradeTestSuite}
+	} else {
+		testSuites = getCSITestSuites()
 	}
 	curDriver := initS3Driver()
 
 	args := framework.GetDriverNameWithFeatureTags(curDriver)
 	args = append(args, func() {
-		framework.DefineTestSuites(curDriver, CSITestSuites)
+		framework.DefineTestSuites(curDriver, testSuites)
 	})
 	f.Context(args...)
 })

tests/e2e-kubernetes/scripts/run.sh

@@ -176,21 +176,21 @@ elif [[ "${ACTION}" == "install_driver" ]]; then
 elif [[ "${ACTION}" == "run_tests" ]]; then
   set +e
   pushd tests/e2e-kubernetes
-  KUBECONFIG=${KUBECONFIG} ginkgo -p -vv --github-output -timeout 60m -- --bucket-region=${REGION} --commit-id=${TAG} --bucket-prefix=${CLUSTER_NAME} --imds-available=${IMDS_AVAILABLE} --cluster-name=${CLUSTER_NAME}
+  KUBECONFIG=${KUBECONFIG} ginkgo -p -vv --github-output -timeout 60m -- --bucket-region=${REGION} --commit-id=${TAG} --bucket-prefix=${CLUSTER_NAME} --imds-available=${IMDS_AVAILABLE} --cluster-name=${CLUSTER_NAME} --cluster-type=${CLUSTER_TYPE}
   EXIT_CODE=$?
   print_cluster_info
   exit $EXIT_CODE
 elif [[ "${ACTION}" == "run_upgrade_tests" ]]; then
   set +e
   pushd tests/e2e-kubernetes
-  KUBECONFIG=${KUBECONFIG} ginkgo -vv --github-output -timeout 10h -- --bucket-region=${REGION} --commit-id=${TAG} --bucket-prefix=${CLUSTER_NAME} --imds-available=${IMDS_AVAILABLE} --cluster-name=${CLUSTER_NAME} --run-upgrade-tests
+  KUBECONFIG=${KUBECONFIG} ginkgo -vv --github-output -timeout 10h -- --bucket-region=${REGION} --commit-id=${TAG} --bucket-prefix=${CLUSTER_NAME} --imds-available=${IMDS_AVAILABLE} --cluster-name=${CLUSTER_NAME} --cluster-type=${CLUSTER_TYPE} --run-upgrade-tests
   EXIT_CODE=$?
   print_cluster_info
   exit $EXIT_CODE
 elif [[ "${ACTION}" == "run_perf" ]]; then
   set +e
   pushd tests/e2e-kubernetes
-  KUBECONFIG=${KUBECONFIG} go test -ginkgo.vv --bucket-region=${REGION} --commit-id=${TAG} --bucket-prefix=${CLUSTER_NAME} --performance=true --imds-available=${IMDS_AVAILABLE} --cluster-name=${CLUSTER_NAME}
+  KUBECONFIG=${KUBECONFIG} go test -ginkgo.vv --bucket-region=${REGION} --commit-id=${TAG} --bucket-prefix=${CLUSTER_NAME} --performance=true --imds-available=${IMDS_AVAILABLE} --cluster-name=${CLUSTER_NAME} --cluster-type=${CLUSTER_TYPE}
   EXIT_CODE=$?
   print_cluster_info
   popd

tests/e2e-kubernetes/testdriver.go

@@ -18,6 +18,7 @@ var (
 	CommitId      string
 	BucketRegion  string // assumed to be the same as k8s cluster's region
 	ClusterName   string
+	ClusterType   string
 	BucketPrefix  string
 	Performance   bool
 	UpgradeTests  bool