From 36b1b38169e90679b35bae0c5137bde8836bd937 Mon Sep 17 00:00:00 2001
From: arjkesh <33526713+arjkesh@users.noreply.github.com>
Date: Wed, 3 Jul 2024 09:52:09 -0700
Subject: [PATCH] Re-enable retries in deep canary (#4035)

---
 test/dlc_tests/sanity/test_canary_integration.py | 3 ++-
 test/testrunner.py                               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/dlc_tests/sanity/test_canary_integration.py b/test/dlc_tests/sanity/test_canary_integration.py
index ee9ee03bcf3f..886ea2db5678 100644
--- a/test/dlc_tests/sanity/test_canary_integration.py
+++ b/test/dlc_tests/sanity/test_canary_integration.py
@@ -61,7 +61,8 @@ def _run_canary_pull_test(region, image_type):
 
 @pytest.mark.usefixtures("sagemaker")
 @pytest.mark.skipif(
-    not is_deep_canary_context(), reason="This test only needs to run in deep-canary context"
+    not is_deep_canary_context() or os.getenv("REGION") == "us-west-2",
+    reason="This test only needs to run in deep-canary context",
 )
 @pytest.mark.deep_canary(
     "Reason: This test acts as a basic smoke check that deep-canary tests work in a region"
diff --git a/test/testrunner.py b/test/testrunner.py
index 1c20608e601c..197e1b046499 100644
--- a/test/testrunner.py
+++ b/test/testrunner.py
@@ -449,7 +449,7 @@ def main():
                 # Add rerun flag to canaries to avoid flakiness. Force pytest to collect only
                 # deep-canary tests, and prevent wastage of threads in the skipping of
                 # non-deep-canary tests.
-                canary_pytest_args = ["-m", "deep_canary"]
+                canary_pytest_args = [pytest_rerun_arg, pytest_rerun_delay_arg, "-m", "deep_canary"]
             pytest_cmds = [pytest_cmd + canary_pytest_args for pytest_cmd in pytest_cmds]
 
         pytest_cmds = [