corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1960465 - Set HG_TO_GIT_MIGRATION_COMPLETE to True, and make sure all unit tests pass. r=perftest-reviewers,sparky

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D248427
This commit is contained in:
Andrej Glavic
2025-05-09 13:57:28 +00:00
committed by aglavic@mozilla.com
parent 1f6c58fbc3
commit afb221d015
2 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/tryselect/selectors/perf.py
View File

@@ -69,7 +69,7 @@ TREEHERDER_ALERT_TASKS_URL = (
) )
# Our ./mach try perf changes should only take effect after we have migrated to github # Our ./mach try perf changes should only take effect after we have migrated to github
HG_TO_GIT_MIGRATION_COMPLETE = False HG_TO_GIT_MIGRATION_COMPLETE = True
ON_GIT = get_repository_object(build.topsrcdir).name == "git" ON_GIT = get_repository_object(build.topsrcdir).name == "git"
# Prevent users from running more than 300 tests at once. It's possible, but # Prevent users from running more than 300 tests at once. It's possible, but
@@ -1324,7 +1324,7 @@ class PerfParser(CompareParser):
dry_run=dry_run, dry_run=dry_run,
closed_tree=False, closed_tree=False,
allow_log_capture=True, allow_log_capture=True,
push_to_vcs=True, push_to_vcs=not ON_GIT,
) )
PerfParser.push_info.base_revision = log_processor.revision PerfParser.push_info.base_revision = log_processor.revision
@@ -1364,7 +1364,7 @@ class PerfParser(CompareParser):
dry_run=dry_run, dry_run=dry_run,
closed_tree=False, closed_tree=False,
allow_log_capture=True, allow_log_capture=True,
push_to_vcs=True, push_to_vcs=not ON_GIT,
) )
PerfParser.push_info.new_revision = log_processor.revision PerfParser.push_info.new_revision = log_processor.revision
@@ -1655,7 +1655,7 @@ def run(**kwargs):
PERFHERDER_BASE_URL % PerfParser.push_info.get_perfcompare_settings() PERFHERDER_BASE_URL % PerfParser.push_info.get_perfcompare_settings()
) )
compareview_url_print = f" The old comparison tool is still available at this URL:\n {compareview_url}\n" compareview_url_print = f" The old comparison tool is still available at this URL:\n {compareview_url}\n"
if HG_TO_GIT_MIGRATION_COMPLETE: if HG_TO_GIT_MIGRATION_COMPLETE and ON_GIT:
perfcompare_url = ( perfcompare_url = (
PERFCOMPARE_BASE_URL_GIT PERFCOMPARE_BASE_URL_GIT
% PerfParser.push_info.get_perfcompare_settings_git() % PerfParser.push_info.get_perfcompare_settings_git()

86
tools/tryselect/test/test_perf.py
View File

@@ -929,11 +929,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=13\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=13\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=13\n"
), ),
), ),
( (
@@ -943,11 +941,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=13\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=13\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=13\n"
), ),
), ),
( (
@@ -957,12 +953,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=cached_base_revision&newRev=revision&" f"baseHash=cached_base_revision&newHash={hash('mocked100')}&baseHashDate=2024-04-04&newHashDate=2025-01-01"
"baseRepo=try&newRepo=try&framework=13\n\n" f"&baseRepo=try&newRepo=try&framework=13\n\n"
" The old comparison tool is still available at this URL:\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=cached_base_revision&newProject=try&newRevision=revision&framework=13\n"
), ),
), ),
( (
@@ -981,11 +974,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=1\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=1\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=1\n"
), ),
), ),
( (
@@ -995,11 +986,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=1\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=1\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=1\n"
), ),
), ),
( (
@@ -1018,11 +1007,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=13\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=13\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=13\n"
), ),
), ),
( (
@@ -1032,11 +1019,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=13\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=13\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=13\n"
), ),
), ),
( (
@@ -1046,11 +1031,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=1\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=1\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=1\n"
), ),
), ),
( (
@@ -1060,11 +1043,9 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
( (
"\n!!!NOTE!!!\n You'll be able to find a performance comparison " "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
"here once the tests are complete (ensure you select the right framework):\n" "here once the tests are complete (ensure you select the right framework):\n"
" https://perf.compare/compare-results?" " https://perf.compare/compare-hash-results?"
"baseRev=revision&newRev=revision&baseRepo=try&newRepo=try&framework=1\n\n" f"baseHash={hash('mockedmocked')}&newHash={hash('mocked100')}&baseHashDate=2025-01-01&newHashDate=2025-01-01"
" The old comparison tool is still available at this URL:\n" f"&baseRepo=try&newRepo=try&framework=1\n\n"
" https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
"Revision=revision&newProject=try&newRevision=revision&framework=1\n"
), ),
), ),
], ],
@@ -1089,7 +1070,17 @@ def test_full_run(options, call_counts, log_ind, expected_log_message):
"tryselect.selectors.perf.PerfParser.set_categories_for_test" "tryselect.selectors.perf.PerfParser.set_categories_for_test"
) as tests_mock, mock.patch( ) as tests_mock, mock.patch(
"tryselect.selectors.perf.requests" "tryselect.selectors.perf.requests"
) as requests_mock: ) as requests_mock, mock.patch(
"tryselect.selectors.perf.datetime"
) as mock_datetime, mock.patch(
"tryselect.selectors.perf.HG_TO_GIT_MIGRATION_COMPLETE", return_value=True
), mock.patch(
"tryselect.selectors.perf.ON_GIT", return_value=True
), mock.patch(
"tryselect.selectors.perf.time.time", return_value=100
), mock.patch(
"tryselect.selectors.perf.subprocess.getoutput", return_value="mocked"
):
def test_mock_func(*args, **kwargs): def test_mock_func(*args, **kwargs):
"""Used for testing any --test functionality.""" """Used for testing any --test functionality."""
@@ -1155,6 +1146,7 @@ def test_full_run(options, call_counts, log_ind, expected_log_message):
fzf.side_effect = fzf_side_effects fzf.side_effect = fzf_side_effects
ccr.return_value = options.get("cached_revision", (None, None)) ccr.return_value = options.get("cached_revision", (None, None))
mock_datetime.today.return_value = datetime(2025, 1, 1)
with category_reset(): with category_reset():
run(**options) run(**options)