From c06f71ee3a46bb6473b484280c06f5a7ef906d87 Mon Sep 17 00:00:00 2001
From: Ryan Lymburner <rlymbur@amazon.com>
Date: Fri, 7 Feb 2025 09:10:46 -0800
Subject: [PATCH] Add E2E Merge Queue Support

---
 .github/PULL_REQUEST_TEMPLATE.md          | 8 ++++++++
 .github/workflows/e2e-test.yaml           | 6 ++----
 .github/workflows/presubmit.yaml          | 4 +---
 test/suites/integration/ram_share_test.go | 5 +++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 83a3e908..93f6e551 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -56,4 +56,12 @@ from users switching to the new release, include the string "action required".
 
 ```
 
+**Do all end-to-end tests successfully pass when running `make e2e-test`?**:
+<!--
+Please provide a snippet of a successful `make e2e-test` run to confirm.
+-->
+```
+
+```
+
 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
\ No newline at end of file
diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
index b946c832..5cdaa574 100644
--- a/.github/workflows/e2e-test.yaml
+++ b/.github/workflows/e2e-test.yaml
@@ -3,10 +3,8 @@ permissions:
   id-token: write
   contents: read
 on:
-  # TODO: Find a secure enough way to run e2e tests from PR on-demand.
-  push:
-    branches:
-      - main
+  merge_group:
+    branches: [ "main" ]
   workflow_dispatch:
 jobs:
   e2e-test:
diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml
index 02d83751..3b2e957e 100644
--- a/.github/workflows/presubmit.yaml
+++ b/.github/workflows/presubmit.yaml
@@ -1,9 +1,7 @@
 name: presubmit
 on:
-  push:
-    branches:
-      - main
   pull_request:
+    branches: [ "main" ]
   workflow_dispatch:
 jobs:
   golangci-lint:
diff --git a/test/suites/integration/ram_share_test.go b/test/suites/integration/ram_share_test.go
index 03006689..19b3a9a9 100644
--- a/test/suites/integration/ram_share_test.go
+++ b/test/suites/integration/ram_share_test.go
@@ -52,10 +52,11 @@ var _ = Describe("RAM Share", Ordered, func() {
 		secondaryTestRoleArn = os.Getenv("SECONDARY_ACCOUNT_TEST_ROLE_ARN")
 
 		retryer := awsClient.DefaultRetryer{
-			MinThrottleDelay: 1 * time.Second,
-			MinRetryDelay:    1 * time.Second,
+			MinThrottleDelay: 500 * time.Millisecond,
+			MinRetryDelay:    500 * time.Millisecond,
 			MaxThrottleDelay: 5 * time.Second,
 			MaxRetryDelay:    5 * time.Second,
+			NumMaxRetries:    5,
 		}
 
 		primarySess := session.Must(session.NewSession(&aws.Config{