Merge branch 'GoogleCloudPlatform:main' into vibansal_privateCAFR

.ci/gcb-push-downstream.yml

@@ -39,11 +39,42 @@ steps:
           - $BRANCH_NAME
           - $COMMIT_SHA
 
+    # TPGB
+    - name: 'gcr.io/graphite-docker-images/bash-plus'
+      entrypoint: '/workspace/.ci/scripts/bash-plus/downstream-waiter/wait_for_commit.sh'
+      id: tpgb-sync
+      waitFor: ["checkout"]
+      args:
+          - 'tpgb-sync'
+          - $BRANCH_NAME
+          - $COMMIT_SHA
+
+    # TGC
+    - name: 'gcr.io/graphite-docker-images/bash-plus'
+      entrypoint: '/workspace/.ci/scripts/bash-plus/downstream-waiter/wait_for_commit.sh'
+      id: tgc-sync
+      waitFor: ["checkout"]
+      args:
+          - 'tgc-sync'
+          - $BRANCH_NAME
+          - $COMMIT_SHA
+
+    # TF-OICS
+    - name: 'gcr.io/graphite-docker-images/bash-plus'
+      entrypoint: '/workspace/.ci/scripts/bash-plus/downstream-waiter/wait_for_commit.sh'
+      id: tf-oics-sync
+      waitFor: ["checkout"]
+      args:
+          - 'tf-oics-sync'
+          - $BRANCH_NAME
+          - $COMMIT_SHA
+
+    # TPG
     - name: 'gcr.io/graphite-docker-images/build-environment'
       entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
       secretEnv: ["GITHUB_TOKEN_CLASSIC"]
       id: tpg-push
-      waitFor: ["tpg-sync", "build-magician-binary"]
+      waitFor: ["tpg-sync", "tpgb-sync", "tgc-sync", "tf-oics-sync", "build-magician-binary"]
       env:
         - BASE_BRANCH=$BRANCH_NAME
       args:
@@ -67,20 +98,11 @@ steps:
             fi
 
     # TPGB
-    - name: 'gcr.io/graphite-docker-images/bash-plus'
-      entrypoint: '/workspace/.ci/scripts/bash-plus/downstream-waiter/wait_for_commit.sh'
-      id: tpgb-sync
-      waitFor: ["checkout"]
-      args:
-          - 'tpgb-sync'
-          - $BRANCH_NAME
-          - $COMMIT_SHA
-
     - name: 'gcr.io/graphite-docker-images/build-environment'
       entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
       secretEnv: ["GITHUB_TOKEN_CLASSIC"]
       id: tpgb-push
-      waitFor: ["tpgb-sync", "build-magician-binary"]
+      waitFor: ["tpg-sync", "tpgb-sync", "tgc-sync", "tf-oics-sync", "build-magician-binary"]
       env:
         - BASE_BRANCH=$BRANCH_NAME
       args:
@@ -104,20 +126,11 @@ steps:
             fi
 
     # TGC
-    - name: 'gcr.io/graphite-docker-images/bash-plus'
-      entrypoint: '/workspace/.ci/scripts/bash-plus/downstream-waiter/wait_for_commit.sh'
-      id: tgc-sync
-      waitFor: ["checkout"]
-      args:
-          - 'tgc-sync'
-          - $BRANCH_NAME
-          - $COMMIT_SHA
-
     - name: 'gcr.io/graphite-docker-images/build-environment'
       entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
       secretEnv: ["GITHUB_TOKEN_CLASSIC"]
       id: tgc-push
-      waitFor: ["tgc-sync", "tpgb-push"]
+      waitFor: ["tpgb-push"]
       env:
         - BASE_BRANCH=$BRANCH_NAME
       args:
@@ -141,20 +154,11 @@ steps:
             fi
 
     # TF-OICS
-    - name: 'gcr.io/graphite-docker-images/bash-plus'
-      entrypoint: '/workspace/.ci/scripts/bash-plus/downstream-waiter/wait_for_commit.sh'
-      id: tf-oics-sync
-      waitFor: ["checkout"]
-      args:
-          - 'tf-oics-sync'
-          - $BRANCH_NAME
-          - $COMMIT_SHA
-
     - name: 'gcr.io/graphite-docker-images/build-environment'
       entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
       secretEnv: ["GITHUB_TOKEN_CLASSIC"]
       id: tf-oics-push
-      waitFor: ["tf-oics-sync", "build-magician-binary"]
+      waitFor: ["tpg-sync", "tpgb-sync", "tgc-sync", "tf-oics-sync", "build-magician-binary"]
       env:
         - BASE_BRANCH=$BRANCH_NAME
       args:
@@ -178,14 +182,15 @@ steps:
             fi
 
     - name: 'gcr.io/graphite-docker-images/go-plus'
-      entrypoint: '/workspace/.ci/scripts/go-plus/vcr-cassette-merger/vcr_merge.sh'
+      entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
       secretEnv: ["GITHUB_TOKEN_CLASSIC", "GOOGLE_PROJECT"]
       id: vcr-merge
       waitFor: ["tpg-push", "tpgb-push", "tgc-push", "tf-oics-push"]
       env:
         - BASE_BRANCH=$BRANCH_NAME
       args:
-          - $COMMIT_SHA
+        - "vcr-merge"
+        - $COMMIT_SHA
 
     - name: 'gcr.io/graphite-docker-images/go-plus'
       id: magician-check-vcr-cassettes

.ci/magician/cmd/SCHEDULED_PR_WAITING_FOR_CONTRIBUTOR.md.tmpl

@@ -0,0 +1,11 @@
+{{ if lt .SinceDays 42 -}}
+@{{.PullRequest.User.Login}}, this PR is waiting for action from you. Please address any comments or change requests, or [re-request review](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review) from a core reviewer if no action is required.
+
+![Image showing the re-request review button](https://docs.github.com/assets/cb-28785/mw-1440/images/help/pull_requests/request-re-review.webp)
+
+If no action is taken, this PR will be closed in {{minus 42 .SinceDays}} days.
+
+This notification can be disabled with the `disable-automatic-closure` label.
+{{ else -}}
+@{{.PullRequest.User.Login}}, this PR is being closed due to inactivity.
+{{ end -}}

.ci/magician/cmd/SCHEDULED_PR_WAITING_FOR_MERGE.md.tmpl

@@ -0,0 +1 @@
+This PR is approved and has been waiting for merge for {{.SinceDays}} days. Is it ready to merge? Use the label `disable-review-reminders` to disable these notifications.

.ci/magician/cmd/SCHEDULED_PR_WAITING_FOR_REVIEW.md.tmpl

@@ -0,0 +1 @@
+{{if ge .SinceDays 7}}@terraform-team {{end}}This PR has been waiting for review for {{.SinceDays}} days. Please take a look! Use the label `disable-review-reminders` to disable these notifications.