Revert "[fuchsia] Pass "--expected_sample_size" to perfcompare.py as consistency check"
This reverts commit 52aa1eee9d52942f9182bc6a1526c5ab6fd51c9a.
Reason for revert:
This introduced failures on a couple of internal builders. Apparently
the CQ did not test those builders for this recipes change.
Original change's description:
> [fuchsia] Pass "--expected_sample_size" to perfcompare.py as consistency check
>
> This will apply when displaying the table of performance results for
> perfcompare and non-perfcompare builds. This tells perfcompare.py to
> check that the number of results for each metric (the sample size)
> matches the recipe's runs_per_shard parameter.
>
> This is intended to catch cases where tests improperly get run more
> than once.
>
> Bug: 343997506
> Run-All-Tests: True
> Change-Id: Id4c97c2a82680270a7d81075def8c53c804a1725
> Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1058660
> Reviewed-by: Oliver Newman <olivernewman@google.com>
> Reviewed-by: Gwen Mittertreiner <gmtr@google.com>
> Commit-Queue: Mark Seaborn <mseaborn@google.com>
Bug: 343997506
Change-Id: Icbb692095f6c881435121f6b83fe4518660e162a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1066411
Reviewed-by: Gwen Mittertreiner <gmtr@google.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Mark Seaborn <mseaborn@google.com>
diff --git a/recipes/fuchsia/fuchsia.expected/child_build_provided.json b/recipes/fuchsia/fuchsia.expected/child_build_provided.json
index 01dd32e..7b2ec3a 100644
--- a/recipes/fuchsia/fuchsia.expected/child_build_provided.json
+++ b/recipes/fuchsia/fuchsia.expected/child_build_provided.json
@@ -1747,7 +1747,6 @@
"vpython3",
"[CLEANUP]/test-orchestration-inputs_tmp_1/perfcompare/perfcompare.py",
"compare_perf",
- "--expected_sample_size=1",
"[CLEANUP]/perf_dataset/with_cl"
],
"luci_context": {
diff --git a/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json b/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
index 4de671e..0d42648 100644
--- a/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
+++ b/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
@@ -1875,7 +1875,6 @@
"vpython3",
"[CLEANUP]/test-orchestration-inputs_tmp_1/perfcompare/perfcompare.py",
"compare_perf",
- "--expected_sample_size=1",
"[CLEANUP]/perf_dataset/with_cl"
],
"luci_context": {
diff --git a/recipes/fuchsia/fuchsia.expected/successful_build_and_test_perfcompare.json b/recipes/fuchsia/fuchsia.expected/successful_build_and_test_perfcompare.json
index 5f28582..41187fe 100644
--- a/recipes/fuchsia/fuchsia.expected/successful_build_and_test_perfcompare.json
+++ b/recipes/fuchsia/fuchsia.expected/successful_build_and_test_perfcompare.json
@@ -4690,7 +4690,6 @@
"vpython3",
"[CLEANUP]/test-orchestration-inputs_tmp_1/perfcompare/perfcompare.py",
"compare_perf",
- "--expected_sample_size=2",
"[CLEANUP]/perf_dataset/without_cl",
"[CLEANUP]/perf_dataset/with_cl"
],
diff --git a/recipes/fuchsia/fuchsia.py b/recipes/fuchsia/fuchsia.py
index da2aaee..d676080 100644
--- a/recipes/fuchsia/fuchsia.py
+++ b/recipes/fuchsia/fuchsia.py
@@ -206,7 +206,6 @@
orchestration_inputs.perfcompare,
results_without_cl,
results_with_cl,
- runs_per_shard,
)
if run_fxt_tests:
@@ -437,7 +436,7 @@
def display_performance_results(
- api, perfcompare_tool_dir, results_without_cl, results_with_cl, runs_per_shard
+ api, perfcompare_tool_dir, results_without_cl, results_with_cl
):
dest_dir = api.path.cleanup_dir / "perf_dataset"
with_cl_dir = dest_dir / "with_cl"
@@ -479,7 +478,6 @@
"vpython3",
perfcompare_tool_dir / "perfcompare.py",
"compare_perf",
- "--expected_sample_size=%d" % runs_per_shard,
]
+ dirs_to_display,
)
