From 3f5556b9b9f46a1098722de35e63142e45f17020 Mon Sep 17 00:00:00 2001 From: Aleksandr Logunov Date: Thu, 26 Sep 2024 14:08:10 +0400 Subject: [PATCH] chore: extract flaky tests from nayduck ci (#12154) These tests should be run on day-to-day basis to monitor progress. But merge on CI should be blocked only by reliable tests. --- nightly/nightly.txt | 23 ++++++++++++++++++++++- nightly/pytest-sanity.txt | 10 ---------- nightly/very_expensive.txt | 11 ----------- 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 nightly/very_expensive.txt diff --git a/nightly/nightly.txt b/nightly/nightly.txt index 11285397dab..9f52404749f 100644 --- a/nightly/nightly.txt +++ b/nightly/nightly.txt @@ -1,4 +1,25 @@ ./sandbox.txt ./pytest.txt ./expensive.txt -./very_expensive.txt \ No newline at end of file + +# Very expensive catchup tests +expensive --timeout=3600 near-client near_client tests::catching_up::test_all_chunks_accepted_1000 +expensive --timeout=3600 near-client near_client tests::catching_up::test_all_chunks_accepted_1000 --features nightly +expensive --timeout=7200 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_slow +expensive --timeout=7200 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_slow --features nightly +expensive --timeout=1800 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_rare_epoch_changing +expensive --timeout=1800 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_rare_epoch_changing --features nightly + +# Very expensive test: make sure Docker image can be build and run +pytest --skip-build --timeout=1h sanity/docker.py + +### Flaky tests. Should be fixed to be added to CI and added back to pytest-sanity.txt +pytest --timeout=120 sanity/garbage_collection.py +pytest --timeout=120 sanity/garbage_collection.py --features nightly +pytest --timeout=120 sanity/validator_switch_key_quick.py +pytest --timeout=120 sanity/validator_switch_key_quick.py --features nightly +pytest --timeout=600 sanity/state_sync_routed.py manytx 115 +pytest --timeout=600 sanity/state_sync_routed.py manytx 115 --features nightly +# Tests for split storage and split storage migration +pytest --timeout=600 sanity/split_storage.py +pytest --timeout=600 sanity/split_storage.py --features nightly diff --git a/nightly/pytest-sanity.txt b/nightly/pytest-sanity.txt index 383ce9bdc69..7b05f4983e3 100644 --- a/nightly/pytest-sanity.txt +++ b/nightly/pytest-sanity.txt @@ -35,8 +35,6 @@ pytest --timeout=240 sanity/state_sync4.py pytest --timeout=240 sanity/state_sync4.py --features nightly pytest --timeout=240 sanity/state_sync5.py pytest --timeout=240 sanity/state_sync5.py --features nightly -pytest --timeout=600 sanity/state_sync_routed.py manytx 115 -pytest --timeout=600 sanity/state_sync_routed.py manytx 115 --features nightly # TODO(#4618): Those tests are currently broken. Comment out while we’re # working on a fix / deciding whether to remove them. #pytest --timeout=300 sanity/state_sync_late.py notx @@ -89,8 +87,6 @@ pytest sanity/rpc_max_gas_burnt.py pytest sanity/rpc_max_gas_burnt.py --features nightly pytest sanity/rpc_tx_status.py pytest sanity/rpc_tx_status.py --features nightly -pytest --timeout=120 sanity/garbage_collection.py -pytest --timeout=120 sanity/garbage_collection.py --features nightly pytest --timeout=120 sanity/garbage_collection1.py pytest --timeout=120 sanity/garbage_collection1.py --features nightly pytest --timeout=180 sanity/garbage_collection_intense.py @@ -113,8 +109,6 @@ pytest sanity/repro_2916.py pytest sanity/repro_2916.py --features nightly pytest --timeout=240 sanity/switch_node_key.py pytest --timeout=240 sanity/switch_node_key.py --features nightly -pytest --timeout=120 sanity/validator_switch_key_quick.py -pytest --timeout=120 sanity/validator_switch_key_quick.py --features nightly pytest --timeout=120 sanity/validator_remove_key_quick.py pytest --timeout=120 sanity/validator_remove_key_quick.py --features nightly pytest --timeout=60 sanity/shadow_tracking.py @@ -162,10 +156,6 @@ pytest sanity/rosetta.py --features nightly # This is the test for meta transactions. pytest sanity/meta_tx.py --features nightly -# Tests for split storage and split storage migration -pytest --timeout=600 sanity/split_storage.py -pytest --timeout=600 sanity/split_storage.py --features nightly - # Tests for resharding # TODO(resharding) Tests for resharding are disabled because resharding is not # compatible with stateless validation, state sync and congestion control. diff --git a/nightly/very_expensive.txt b/nightly/very_expensive.txt deleted file mode 100644 index 6bf4468619c..00000000000 --- a/nightly/very_expensive.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Catchup tests -expensive --timeout=3600 near-client near_client tests::catching_up::test_all_chunks_accepted_1000 -expensive --timeout=3600 near-client near_client tests::catching_up::test_all_chunks_accepted_1000 --features nightly -expensive --timeout=7200 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_slow -expensive --timeout=7200 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_slow --features nightly -expensive --timeout=1800 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_rare_epoch_changing -expensive --timeout=1800 near-client near_client tests::catching_up::test_all_chunks_accepted_1000_rare_epoch_changing --features nightly - -# Make sure Docker image can be build and run -pytest --skip-build --timeout=1h sanity/docker.py -