Pivot to option 2 for pubsub | Update cleanup trigger to use PR branch for config file | Update filter for ops-e2e-testing tag

Author: aabmass

cloudbuild-e2e-cloud-functions-gen2.yaml

@@ -72,3 +72,6 @@ logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
   _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:${SHORT_SHA}
   _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-go-e2e-test-server:${SHORT_SHA}
+
+options:
+  pubsubTopic: projects/${PROJECT_ID}/topics/e2e-cleanup

cloudbuild-e2e-cloud-run.yaml

@@ -48,3 +48,6 @@ logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
   _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:${SHORT_SHA}
   _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-go-e2e-test-server:${SHORT_SHA}
+
+options:
+  pubsubTopic: projects/${PROJECT_ID}/topics/e2e-cleanup

cloudbuild-e2e-gae-standard.yaml

@@ -71,3 +71,6 @@ logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
   _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:${SHORT_SHA}
   _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-go-e2e-test-server:${SHORT_SHA}
+
+options:
+  pubsubTopic: projects/${PROJECT_ID}/topics/e2e-cleanup

cloudbuild-e2e-gae.yaml

@@ -49,3 +49,6 @@ logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
   _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:${SHORT_SHA}
   _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-go-e2e-test-server:${SHORT_SHA}
+
+options:
+  pubsubTopic: projects/${PROJECT_ID}/topics/e2e-cleanup

cloudbuild-e2e-gce.yaml

@@ -48,3 +48,6 @@ logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
   _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:${SHORT_SHA}
   _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-go-e2e-test-server:${SHORT_SHA}
+
+options:
+  pubsubTopic: projects/${PROJECT_ID}/topics/e2e-cleanup

cloudbuild-e2e-gke.yaml

@@ -48,3 +48,6 @@ logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
   _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:${SHORT_SHA}
   _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-go-e2e-test-server:${SHORT_SHA}
+
+options:
+  pubsubTopic: projects/${PROJECT_ID}/topics/e2e-cleanup

tf/persistent/repo-ci-triggers.tf

@@ -40,26 +40,33 @@ module "go" {
   run_on     = ["local", "gce", "gke", "gae", "gae-standard", "cloud-run", "cloud-functions-gen2"]
 }
 
+resource "google_pubsub_topic" "e2e_cleanup" {
+  name    = "e2e-cleanup"
+  project = var.project_id
+}
+
 resource "google_cloudbuild_trigger" "global_cleanup" {
   name        = "global-e2e-cleanup"
   description = "Global cleanup for E2E tests triggered by Pub/Sub"
 
   pubsub_config {
-    topic = "projects/${var.project_id}/topics/cloud-builds"
+    topic = google_pubsub_topic.e2e_cleanup.id
   }
 
-  filter = "\"terraform-resources\" in body.message.data.tags && (body.message.data.status == \"SUCCESS\" || body.message.data.status == \"FAILURE\")"
+  filter = "(_BUILD_TAGS.contains(\"terraform-resources\") || _BUILD_TAGS.contains(\"ops-e2e-testing\")) && (_BUILD_STATUS == \"SUCCESS\" || _BUILD_STATUS == \"FAILURE\")"
 
   git_file_source {
     path       = "cloudbuild-cleanup.yaml"
     uri        = "https://github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing"
-    revision   = "refs/heads/main"
+    revision   = "refs/heads/durable-async-cleanup"
     repo_type  = "GITHUB"
   }
 
   substitutions = {
     _TEST_RUN_ID       = "$(body.message.data.id)"
     _E2E_ENVIRONMENT   = "$(body.message.data.substitutions._E2E_ENVIRONMENT)"
     _TEST_RUNNER_IMAGE = "$(body.message.data.substitutions._TEST_RUNNER_IMAGE)"
+    _BUILD_TAGS        = "$(body.message.data.tags)"
+    _BUILD_STATUS      = "$(body.message.data.status)"
   }
 }