[testing_requests] Enable ffx on hardware bots.
Before we wanted to be able to enable `ffx test` on only emulators
first, but now that we want to test out flashing, we need to enable on
hardware as well. If by the time we do enable ffx in prod and we want to
enable it separately for emulators and hardware, we should probably put
that logic in testrunner instead.
Bug: 91040
Change-Id: I2ee5d01325a605aa8b85ca005e4d27dc4527ab2a
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/757106
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Fuchsia-Auto-Submit: Ina Huh <ihuh@google.com>
diff --git a/recipe_modules/testing_requests/api.py b/recipe_modules/testing_requests/api.py
index 9544ebb..ff8faa6 100644
--- a/recipe_modules/testing_requests/api.py
+++ b/recipe_modules/testing_requests/api.py
@@ -23,10 +23,6 @@
GCSPROXY_CIPD_REVISION = "git_revision:9f8534bc114000de0b4e3a85738bcb0e7af06109"
NSJAIL_CIPD_REVISION = "build_id:8840659429159557552"
-# The ffx-experiment-level that will enable all ffx features in botanist and
-# testrunner.
-FFX_MAX_EXPERIMENT_LEVEL = 2
-
@attr.s
class TaskRequester:
@@ -333,9 +329,7 @@
["-image-overrides", self._api.json.dumps(shard.image_overrides)]
)
- if (
- is_emu_type and (self._use_ffx or self._ffx_experiment_level > 0)
- ) or self._ffx_experiment_level == FFX_MAX_EXPERIMENT_LEVEL:
+ if self._use_ffx or self._ffx_experiment_level > 0:
cmd.extend(["-ffx", "./ffx"])
if self._ffx_experiment_level > 0:
cmd.extend(
diff --git a/recipe_modules/testing_requests/tests/full.expected/device_ffx.json b/recipe_modules/testing_requests/tests/full.expected/device_ffx.json
index fba8cb0..a525e93 100644
--- a/recipe_modules/testing_requests/tests/full.expected/device_ffx.json
+++ b/recipe_modules/testing_requests/tests/full.expected/device_ffx.json
@@ -78,7 +78,7 @@
"-u",
"RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
"--link-json",
- "{\"[START_DIR]/out/not-default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/bootserver_new\"], \"[START_DIR]/out/not-default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/botanist\"], \"[START_DIR]/out/not-default/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/llvm-symbolizer\"], \"[START_DIR]/out/not-default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/testrunner\"], \"[START_DIR]/out/not-default/path/to/a/dep\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/path/to/a/dep\"]}"
+ "{\"[START_DIR]/out/not-default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/bootserver_new\"], \"[START_DIR]/out/not-default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/botanist\"], \"[START_DIR]/out/not-default/linux_x64/ffx\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/ffx\"], \"[START_DIR]/out/not-default/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/llvm-symbolizer\"], \"[START_DIR]/out/not-default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/testrunner\"], \"[START_DIR]/out/not-default/path/to/a/dep\": [\"[CLEANUP]/isolate_tmp_1/out/not-default/path/to/a/dep\"]}"
],
"env": {
"PRESERVE_SYMLINKS": "1"
@@ -255,6 +255,10 @@
"@@@STEP_LOG_LINE@requests@ \"gs://fuchsia-artifacts/builds/0/images/images.json\", @@@",
"@@@STEP_LOG_LINE@requests@ \"-timeout\", @@@",
"@@@STEP_LOG_LINE@requests@ \"1800s\", @@@",
+ "@@@STEP_LOG_LINE@requests@ \"-ffx\", @@@",
+ "@@@STEP_LOG_LINE@requests@ \"./ffx\", @@@",
+ "@@@STEP_LOG_LINE@requests@ \"-ffx-experiment-level\", @@@",
+ "@@@STEP_LOG_LINE@requests@ \"1\", @@@",
"@@@STEP_LOG_LINE@requests@ \"-local-repo\", @@@",
"@@@STEP_LOG_LINE@requests@ \"path/to/pkg/repo\", @@@",
"@@@STEP_LOG_LINE@requests@ \"-download-manifest\", @@@",
