Merge pull request #2222 from mattcary/cp-arm-lssd

Cherry-pick arm lssd disable #2219

Author: k8s-ci-robot

test/e2e/tests/setup_e2e_test.go

@@ -62,6 +62,9 @@ var (
 	hdMachineType    = flag.String("hyperdisk-machine-type", "c3-standard-4", "Type of machine to provision instance on, or `none' to skip")
 	hdMinCpuPlatform = flag.String("hyperdisk-min-cpu-platform", "sapphirerapids", "Minimum CPU architecture")
 
+	// Some architectures don't have local ssd. Give way to opt out of tests like datacache.
+	skipLocalSsdTests = flag.Bool("skip-local-ssd-tests", false, "Skip local ssd tests like datacache")
+
 	testContexts          = []*remote.TestContext{}
 	hyperdiskTestContexts = []*remote.TestContext{}
 	computeService        *compute.Service
@@ -183,6 +186,13 @@ func NewDefaultTestContext(zone string, instanceNumber string) *remote.TestConte
 	return NewTestContext(zone, *minCpuPlatform, *machineType, instanceNumber)
 }
 
+func getLocalSsdCount() int64 {
+	if *skipLocalSsdTests {
+		return 0
+	}
+	return common.LocalSSDCountForDataCache
+}
+
 func NewTestContext(zone, minCpuPlatform, machineType string, instanceNumber string) *remote.TestContext {
 	nodeID := fmt.Sprintf("%s-%s-%s-%s", *vmNamePrefix, zone, machineType, instanceNumber)
 	klog.Infof("Setting up node %s", nodeID)
@@ -199,7 +209,7 @@ func NewTestContext(zone, minCpuPlatform, machineType string, instanceNumber str
 		CloudtopHost:              *cloudtopHost,
 		EnableConfidentialCompute: *enableConfidentialCompute,
 		ComputeService:            computeService,
-		LocalSSDCount:             common.LocalSSDCountForDataCache,
+		LocalSSDCount:             getLocalSsdCount(),
 	}
 
 	if machineType == *hdMachineType {

test/e2e/tests/single_zone_e2e_test.go

@@ -1483,6 +1483,9 @@ var _ = Describe("GCE PD CSI Driver", func() {
 	It("Should create disks, attach them to instance with local ssd, setup caching between LSSD->detach->reattach to same instance", func() {
 		Expect(testContexts).ToNot(BeEmpty())
 		testContext := getRandomTestContext()
+		if testContext.Instance.GetLocalSSD() == 0 {
+			Skip("Skipping data cache as no local ssd in context")
+		}
 
 		p, z, _ := testContext.Instance.GetIdentity()
 		client := testContext.Client