Re-enable retries in deep canary (#4035)

Author: arjkesh

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"

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 = [