merge-with-main

.ci/containers/README.md

@@ -24,6 +24,6 @@ Before you begin, set up Docker (including configuring it to [authenticate with
    ```
 4. Update cloudbuild yaml files to reference the image you just pushed by adding the `:testing` suffix
 5. Update files that will cause the cloudbuild yaml changes (and therefore your changes) to be exercised
-   - Tip: Modifying `mmv1/third_party/terraform/services/compute/metadata.go.erb` will trigger builds for TPG, TPGB, and TGC.
+   - Tip: Modifying `mmv1/third_party/terraform/services/compute/metadata.go.tmpl` will trigger builds for TPG, TPGB, and TGC.
 6. Create a PR with these changes.
 7. Verify that the cloudbuild steps that should use your testing image _are_ using your testing image (in the Execution Details tab for the step.)

.ci/gcb-contributor-membership-checker.yml

@@ -62,7 +62,7 @@ steps:
     entrypoint: "/workspace/.ci/scripts/go-plus/magician/exec.sh"
     id: contributor-membership-checker
     secretEnv:
-      ["GITHUB_TOKEN_MAGIC_MODULES", "GENERATE_DIFFS_TRIGGER", "COMMUNITY_CHECKER_TRIGGER"]
+      ["GITHUB_TOKEN_MAGIC_MODULES", "DOWNSTREAM_GENERATION_AND_TEST_TRIGGER"]
     timeout: 8000s
     args:
       - "membership-checker"
@@ -74,7 +74,5 @@ availableSecrets:
   secretManager:
     - versionName: projects/673497134629/secrets/github-magician-token-generate-diffs-magic-modules/versions/latest
       env: GITHUB_TOKEN_MAGIC_MODULES
-    - versionName: projects/673497134629/secrets/ci-trigger-generate-diffs/versions/latest
-      env: GENERATE_DIFFS_TRIGGER
-    - versionName: projects/673497134629/secrets/ci-trigger-community-checker/versions/latest
-      env: COMMUNITY_CHECKER_TRIGGER
+    - versionName: projects/673497134629/secrets/ci-trigger-downstream-generation-and-test/versions/latest
+      env: DOWNSTREAM_GENERATION_AND_TEST_TRIGGER

.ci/gcb-generate-diffs-new.yml

@@ -69,6 +69,18 @@ steps:
       id: build-magician-binary
       waitFor: ["merged"]
 
+    - name: 'gcr.io/graphite-docker-images/build-environment'
+      entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
+      id: remove-label
+      secretEnv: ["GITHUB_TOKEN_MAGIC_MODULES"]
+      waitFor: ["build-magician-binary"]
+      env:
+        - BASE_BRANCH=$_BASE_BRANCH
+      args:
+          - 'remove-label'
+          - $_PR_NUMBER
+          - 'awaiting-approval'
+
     - name: 'gcr.io/graphite-docker-images/build-environment'
       entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
       id: tpg-head
@@ -281,7 +293,7 @@ steps:
         - COMMIT_SHA=$COMMIT_SHA
 
 # Long timeout to enable waiting on VCR test
-timeout: 20000s
+timeout: 64800s
 options:
     machineType: 'N1_HIGHCPU_32'