fix(integration_tests): use correct alert types

Author: cabljac

integration_test/cloudbuild.yaml

@@ -130,16 +130,7 @@ steps:
 
         node scripts/run-tests.js \
           --sequential \
-          v2_firestore \
-          v2_database \
-          v2_pubsub \
-          v2_storage \
-          v2_scheduler \
-          v2_tasks \
-          v2_eventarc \
           v2_alerts \
-          v2_testlab \
-          v2_remoteconfig \
           --use-published-sdk=file:$$WHEEL_FILE
 
 # Artifacts to store

integration_test/config/suites.yaml

@@ -181,7 +181,7 @@ suites:
     functions:
       - name: alertsOnAlertPublished
         trigger: onAlertPublished
-        alertType: "billing.planAutomatedUpdatePublished"
+        alertType: "billing.planAutomatedUpdate"
 
   # V2 Test Lab triggers
   - name: v2_testlab

integration_test/scripts/run-tests.js

@@ -596,46 +596,14 @@ class TestRunner {
 
       // If not deleted yet, try alternative methods
       if (!deleted) {
-        // For v2 functions, try to delete the Cloud Run service directly
+        // For v2 functions, use gcloud functions delete with --gen2 flag
         if (metadata.projectId === "functions-integration-tests-v2") {
-          this.log(`   Attempting Cloud Run service deletion for v2 function...`, "warn");
-          // Cloud Run service names are lowercase
-          const cloudRunServiceName = functionName.toLowerCase();
-          try {
-            await this.exec(
-              `gcloud run services delete ${cloudRunServiceName} --region=${
-                metadata.region || DEFAULT_REGION
-              } --project=${metadata.projectId} --quiet`,
-              { silent: true }
-            );
-
-            // Verify deletion
-            try {
-              await this.exec(
-                `gcloud run services describe ${cloudRunServiceName} --region=${
-                  metadata.region || DEFAULT_REGION
-                } --project=${metadata.projectId}`,
-                { silent: true }
-              );
-              // If describe succeeds, function still exists
-              this.log(`   ⚠️ Cloud Run service still exists after deletion: ${functionName}`, "warn");
-            } catch {
-              // If describe fails, function was deleted
-              this.log(`   ✅ Deleted function as Cloud Run service: ${functionName}`, "success");
-              deleted = true;
-            }
-          } catch (runError) {
-            this.log(`   ⚠️ Cloud Run delete failed: ${runError.message}`, "warn");
-          }
-        }
-
-        // If still not deleted, try gcloud functions delete as last resort
-        if (!deleted) {
+          this.log(`   Attempting gcloud functions delete with --gen2 flag...`, "warn");
           try {
             await this.exec(
               `gcloud functions delete ${functionName} --region=${
                 metadata.region || DEFAULT_REGION
-              } --project=${metadata.projectId} --quiet`,
+              } --project=${metadata.projectId} --gen2 --quiet`,
               { silent: true }
             );
 
@@ -644,15 +612,15 @@ class TestRunner {
               await this.exec(
                 `gcloud functions describe ${functionName} --region=${
                   metadata.region || DEFAULT_REGION
-                } --project=${metadata.projectId}`,
+                } --project=${metadata.projectId} --gen2`,
                 { silent: true }
               );
               // If describe succeeds, function still exists
               this.log(`   ⚠️ Function still exists after gcloud delete: ${functionName}`, "warn");
               deleted = false;
             } catch {
               // If describe fails, function was deleted
-              this.log(`   ✅ Deleted function via gcloud: ${functionName}`, "success");
+              this.log(`   ✅ Deleted function via gcloud gen2: ${functionName}`, "success");
               deleted = true;
             }
           } catch (e) {