Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable retries in deep canary #4035

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Re-enable retries in deep canary #4035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31e7722
Revert "deep_canary: temp remove rerun argument (#4027)"
arjkesh Jul 3, 2024
1e6a931
do not run pull test in us-west-2, it is redundant
arjkesh Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/dlc_tests/sanity/test_canary_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/testrunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
Loading