diff --git a/.github/scripts/analytics/flaky_tests_history.py b/.github/scripts/analytics/flaky_tests_history.py index e31039dea47f..41a9ac6ef224 100755 --- a/.github/scripts/analytics/flaky_tests_history.py +++ b/.github/scripts/analytics/flaky_tests_history.py @@ -39,7 +39,7 @@ def main(): """ try: - results = ydb_wrapper.execute_scan_query(last_date_query, query_name="get_last_date_from_history") + results = ydb_wrapper.execute_scan_query(last_date_query, query_name=f"get_last_date_from_history_{branch}") default_start_date = datetime.date(2024, 9, 1) base_date = datetime.date(1970, 1, 1) @@ -172,7 +172,7 @@ def main(): ) """ - results = ydb_wrapper.execute_scan_query(query_get_history, query_name="get_flaky_test_history_for_date") + results = ydb_wrapper.execute_scan_query(query_get_history, query_name=f"get_flaky_test_history_for_date_{branch}") print(f'📈 History data captured, {len(results)} rows') # Prepare data for upsert diff --git a/.github/scripts/analytics/tests_monitor.py b/.github/scripts/analytics/tests_monitor.py index 8dc2f9190268..69e0a8baf93f 100755 --- a/.github/scripts/analytics/tests_monitor.py +++ b/.github/scripts/analytics/tests_monitor.py @@ -283,7 +283,7 @@ def main(): """ try: - results = ydb_wrapper.execute_scan_query(query_last_exist_day, query_name="get_max_monitor_date") + results = ydb_wrapper.execute_scan_query(query_last_exist_day, query_name=f"get_max_monitor_date_{branch}") last_exist_day = results[0]['last_exist_day'] if results else None except Exception as e: print(f"Error during fetching last existing day: {e}") @@ -304,7 +304,7 @@ def main(): """ try: - results = ydb_wrapper.execute_scan_query(query_branch_creation, query_name="get_branch_creation_date") + results = ydb_wrapper.execute_scan_query(query_branch_creation, query_name=f"get_branch_creation_date_{branch}") branch_creation_date = None if results and results[0]['earliest_run']: @@ -358,7 +358,7 @@ def main(): """ try: - results = ydb_wrapper.execute_scan_query(query_last_exist_data, query_name="get_monitor_data_for_date") + results = ydb_wrapper.execute_scan_query(query_last_exist_data, query_name=f"get_monitor_data_for_date_{branch}") last_exist_data = [] for row in results: @@ -470,7 +470,7 @@ def main(): AND hist.date_window = owners_t.date; """ # Execute query using ydb_wrapper - results = ydb_wrapper.execute_scan_query(query_get_history, query_name="get_monitor_history_for_date") + results = ydb_wrapper.execute_scan_query(query_get_history, query_name=f"get_monitor_history_for_date_{branch}") # Check if new data was found if results: diff --git a/.github/scripts/tests/create_new_muted_ya.py b/.github/scripts/tests/create_new_muted_ya.py index b4b8cd9ba506..af12a34e1811 100755 --- a/.github/scripts/tests/create_new_muted_ya.py +++ b/.github/scripts/tests/create_new_muted_ya.py @@ -146,7 +146,7 @@ def execute_query(branch='main', build_type='relwithdebinfo', days_window=1): logging.info("Successfully connected to YDB") logging.info("Starting to fetch results...") - results = ydb_wrapper.execute_scan_query(query_string, query_name="get_tests_monitor_data") + results = ydb_wrapper.execute_scan_query(query_string, query_name=f"get_tests_monitor_data_{branch}") logging.info(f"Query completed successfully. Total rows returned: {len(results)}") return results diff --git a/.github/scripts/tests/get_muted_tests.py b/.github/scripts/tests/get_muted_tests.py index c2b2d49719ee..5c6a9256837c 100755 --- a/.github/scripts/tests/get_muted_tests.py +++ b/.github/scripts/tests/get_muted_tests.py @@ -98,9 +98,9 @@ def get_all_tests(job_id=None, branch=None, build_type=None): # Determine query name based on mode if job_id and branch: - query_name = "get_all_tests_extend_main_with_pr" + query_name = f"get_all_tests_extend_main_with_pr_{branch}" else: - query_name = "get_all_tests_with_run_timestamp_last" + query_name = f"get_all_tests_with_run_timestamp_last_{branch}" if branch else "get_all_tests_with_run_timestamp_last" print(f'⏱️ Starting query execution...') results = ydb_wrapper.execute_scan_query(tests_query, query_name=query_name)