Merge branch 'GoogleCloudPlatform:main' into hns_folders

.ci/gcb-pr-downstream-generation-and-test.yml

@@ -277,7 +277,7 @@ steps:
         - COMMIT_SHA=$COMMIT_SHA
 
 # Long timeout to enable waiting on VCR test
-timeout: 20000s
+timeout: 64800s
 options:
     machineType: 'N1_HIGHCPU_32'
 

.ci/magician/cmd/vcr_merge_eap.go

@@ -0,0 +1,57 @@
+package cmd
+
+import (
+	"fmt"
+	"magician/exec"
+	"magician/github"
+	"magician/source"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var vcrMergeEapCmd = &cobra.Command{
+	Use:   "vcr-merge-eap",
+	Short: "Merge VCR cassettes for EAP",
+	Long: `This command is triggered in .ci/gcb-push-downstream.yml to merge vcr cassettes.
+
+	The command expects the following as arguments:
+	1. CL number
+
+	It then performs the following operations:
+	1. Run gsutil to list, copy, and remove the vcr cassettes fixtures.
+	`,
+	Args: cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		clNumber := args[0]
+		fmt.Println("CL number:", clNumber)
+
+		githubToken, ok := os.LookupEnv("GITHUB_TOKEN_CLASSIC")
+		if !ok {
+			return fmt.Errorf("did not provide GITHUB_TOKEN_CLASSIC environment variable")
+		}
+
+		baseBranch := os.Getenv("BASE_BRANCH")
+		if baseBranch == "" {
+			return fmt.Errorf("environment variable BASE_BRANCH is empty")
+		}
+
+		rnr, err := exec.NewRunner()
+		if err != nil {
+			return fmt.Errorf("error creating Runner: %w", err)
+		}
+
+		gh := github.NewClient(githubToken)
+		return execVCRMergeEAP(gh, clNumber, baseBranch, rnr)
+	},
+}
+
+func execVCRMergeEAP(gh GithubClient, clNumber, baseBranch string, runner source.Runner) error {
+	head := "auto-cl-" + clNumber
+	mergeCassettes("gs://ci-vcr-cassettes/private", baseBranch, fmt.Sprintf("refs/heads/%s", head), runner)
+	return nil
+}
+
+func init() {
+	rootCmd.AddCommand(vcrMergeEapCmd)
+}