Stop using bot_id from swarming test api.
setting bot_id using the properties of the swarming test api has been
deprecated.
Change-Id: I5ec6dbe00c7bd0e5be011f6bd29b7ae310bbcf34
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/19960
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/fuchsia_util/api.py b/recipe_modules/fuchsia_util/api.py
index 3749890..7716be4 100644
--- a/recipe_modules/fuchsia_util/api.py
+++ b/recipe_modules/fuchsia_util/api.py
@@ -5,6 +5,10 @@
from contextlib import contextmanager
from recipe_engine import recipe_api
+
+PYTHON_VERSION_COMPATIBILITY = 'PY2+3'
+
+
BUCKET_NAME = 'flutter_infra'
FUCHSIA_BUCKET_NAME = 'fuchsia'
FUCHSIA_SDK_CIPD = 'fuchsia/sdk/core/linux-amd64'
diff --git a/recipe_modules/fuchsia_util/examples/full.expected/basic.json b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
index 60552fb..30ad19e 100644
--- a/recipe_modules/fuchsia_util/examples/full.expected/basic.json
+++ b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
@@ -315,7 +315,7 @@
"[CACHE]/cipd/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
"archive",
"-cas-instance",
- "projects/example.swarmingserver/instances/default_instance",
+ "projects/example-cas-server/instances/default_instance",
"-dump-digest",
"/path/to/tmp/",
"-paths",
@@ -325,7 +325,7 @@
"name": "Fuchsia Tests.Create CAS Archive.Archive Fuchsia Test CAS",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example.swarmingserver/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
+ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
]
},
{
@@ -361,7 +361,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CACHE]/cipd/infra/tools/luci/swarming/test_version"
+ "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin"
],
"infra_step": true,
"name": "Fuchsia Tests.install infra/tools/luci/swarming.ensure package directory",
@@ -374,9 +374,9 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/cipd/infra/tools/luci/swarming/test_version",
+ "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin",
"-ensure-file",
- "infra/tools/luci/swarming/${platform} test_version",
+ "infra/tools/luci/swarming/${platform} swarming_module_pin",
"-max-threads",
"0",
"-json-output",
@@ -390,7 +390,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-test_version----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-swarming_module_\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -401,12 +401,12 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/tools/luci/swarming/test_version/swarming",
+ "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin/swarming",
"spawn-tasks",
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"flutter_fuchsia_driver_tests\", \"priority\": \"100\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"3600\", \"properties\": {\"cas_input_root\": {\"cas_instance\": \"projects/example.swarmingserver/instances/default_instance\", \"digest\": {\"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\", \"size_bytes\": \"0\"}}, \"cipd_input\": {\"packages\": [{\"package_name\": \"flutter/fuchsia_ctl/${platform}\", \"path\": \".\", \"version\": null}]}, \"command\": [\"./run_fuchsia_tests.sh\", \"generic-x64.tgz\"], \"containment\": {\"containment_type\": \"AUTO\"}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"luci.flutter.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"3600\", \"grace_period_secs\": \"30\", \"idempotent\": true, \"io_timeout_secs\": \"3600\", \"outputs\": [], \"relative_cwd\": \"\"}, \"wait_for_capacity\": false}]}]}",
+ "{\"requests\": [{\"name\": \"flutter_fuchsia_driver_tests\", \"priority\": \"100\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"3600\", \"properties\": {\"cas_input_root\": {\"cas_instance\": \"projects/example-cas-server/instances/default_instance\", \"digest\": {\"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\", \"size_bytes\": \"0\"}}, \"cipd_input\": {\"packages\": [{\"package_name\": \"flutter/fuchsia_ctl/${platform}\", \"path\": \".\", \"version\": null}]}, \"command\": [\"./run_fuchsia_tests.sh\", \"generic-x64.tgz\"], \"containment\": {\"containment_type\": \"AUTO\"}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"luci.flutter.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"3600\", \"grace_period_secs\": \"30\", \"idempotent\": true, \"io_timeout_secs\": \"3600\", \"outputs\": [], \"relative_cwd\": \"\"}, \"wait_for_capacity\": false}]}]}",
"-json-output",
"/path/to/tmp/json"
],
@@ -441,7 +441,7 @@
"@@@STEP_LOG_LINE@json.input@ \"expiration_secs\": \"3600\", @@@",
"@@@STEP_LOG_LINE@json.input@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.input@ \"cas_input_root\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"cas_instance\": \"projects/example.swarmingserver/instances/default_instance\", @@@",
+ "@@@STEP_LOG_LINE@json.input@ \"cas_instance\": \"projects/example-cas-server/instances/default_instance\", @@@",
"@@@STEP_LOG_LINE@json.input@ \"digest\": {@@@",
"@@@STEP_LOG_LINE@json.input@ \"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\", @@@",
"@@@STEP_LOG_LINE@json.input@ \"size_bytes\": \"0\"@@@",
@@ -505,7 +505,7 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/tools/luci/swarming/test_version/swarming",
+ "[CACHE]/cipd/infra/tools/luci/swarming/swarming_module_pin/swarming",
"collect",
"-server",
"https://example.swarmingserver.appspot.com",
diff --git a/recipe_modules/fuchsia_util/test_api.py b/recipe_modules/fuchsia_util/test_api.py
index 77a9015..0ef0553 100644
--- a/recipe_modules/fuchsia_util/test_api.py
+++ b/recipe_modules/fuchsia_util/test_api.py
@@ -2,8 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from PB.recipe_modules.recipe_engine.swarming import properties
from recipe_engine import recipe_test_api
+PYTHON_VERSION_COMPATIBILITY = 'PY2+3'
+
class FuchsiaUtilTestApi(recipe_test_api.RecipeTestApi):
@@ -12,4 +15,4 @@
'task2']))
def device_name_data(self):
- return self.m.swarming.properties(bot_id='abc--fuchsia-node')
+ return self.m.properties.environ(properties.EnvProperties(SWARMING_BOT_ID='abc--fuchsia-node'))
