Replace Get operations with polling and skip flakes during integration test

Author: prachirp

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -1066,7 +1066,7 @@ func (cloud *CloudProvider) getRegionalDiskTypeURI(project string, region, diskT
 func (cloud *CloudProvider) waitForZonalOp(ctx context.Context, project, opName string, zone string) error {
 	// The v1 API can query for v1, alpha, or beta operations.
 	return wait.ExponentialBackoff(WaitForOpBackoff, func() (bool, error) {
-		pollOp, err := cloud.service.ZoneOperations.Get(project, zone, opName).Context(ctx).Do()
+		pollOp, err := cloud.service.ZoneOperations.Wait(project, zone, opName).Context(ctx).Do()
 		if err != nil {
 			klog.Errorf("WaitForOp(op: %s, zone: %#v) failed to poll the operation", opName, zone)
 			return false, err
@@ -1079,7 +1079,7 @@ func (cloud *CloudProvider) waitForZonalOp(ctx context.Context, project, opName
 func (cloud *CloudProvider) waitForRegionalOp(ctx context.Context, project, opName string, region string) error {
 	// The v1 API can query for v1, alpha, or beta operations.
 	return wait.ExponentialBackoff(WaitForOpBackoff, func() (bool, error) {
-		pollOp, err := cloud.service.RegionOperations.Get(project, region, opName).Context(ctx).Do()
+		pollOp, err := cloud.service.RegionOperations.Wait(project, region, opName).Context(ctx).Do()
 		if err != nil {
 			klog.Errorf("WaitForOp(op: %s, region: %#v) failed to poll the operation", opName, region)
 			return false, err
@@ -1091,7 +1091,7 @@ func (cloud *CloudProvider) waitForRegionalOp(ctx context.Context, project, opNa
 
 func (cloud *CloudProvider) waitForGlobalOp(ctx context.Context, project, opName string) error {
 	return wait.ExponentialBackoff(WaitForOpBackoff, func() (bool, error) {
-		pollOp, err := cloud.service.GlobalOperations.Get(project, opName).Context(ctx).Do()
+		pollOp, err := cloud.service.GlobalOperations.Wait(project, opName).Context(ctx).Do()
 		if err != nil {
 			klog.Errorf("waitForGlobalOp(op: %s) failed to poll the operation", opName)
 			return false, err

test/k8s-integration/main.go

@@ -636,7 +636,7 @@ func handle() error {
 }
 
 func generateGCETestSkip(testParams *testParameters) string {
-	skipString := "\\[Disruptive\\]|\\[Serial\\]"
+	skipString := "\\[Disruptive\\]|\\[Serial\\]|\\[Flaky\\]"
 	// Skip mount options test until we fix the invalid mount options for xfs.
 	skipString = skipString + "|csi-gcepd-sc-xfs.*provisioning.should.provision.storage.with.mount.options"
 
@@ -672,7 +672,7 @@ func generateGCETestSkip(testParams *testParameters) string {
 }
 
 func generateGKETestSkip(testParams *testParameters) string {
-	skipString := "\\[Disruptive\\]|\\[Serial\\]"
+	skipString := "\\[Disruptive\\]|\\[Serial\\]|\\[Flaky\\]"
 
 	curVer := mustParseVersion(testParams.clusterVersion)
 	var nodeVer *version