Prepare iOS device for build+test recipe
Change-Id: I6a5755918343bea772ac7e991aa563f1a79e1e72
Bug: https://github.com/flutter/flutter/issues/142917
CP Request: https://github.com/flutter/flutter/issues/143326
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/54841
Commit-Queue: Keyong Han <keyonghan@google.com>
Reviewed-by: Victoria Ashworth <vashworth@google.com>
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/55082
Reviewed-by: Casey Hillers <chillers@google.com>
Commit-Queue: Victoria Ashworth <vashworth@google.com>
Reviewed-by: Keyong Han <keyonghan@google.com>
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json b/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
index 2c9c712..66353fd 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/artifact does not exist.json
@@ -844,7 +844,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -905,6 +905,7 @@
"@@@STEP_LOG_LINE@request@ \"artifact\": \"def\",@@@",
"@@@STEP_LOG_LINE@request@ \"dependencies\": [],@@@",
"@@@STEP_LOG_LINE@request@ \"git_branch\": \"master\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Linux\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Linux abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [],@@@",
"@@@STEP_LOG_LINE@request@ \"task_name\": \"abc\"@@@",
@@ -918,6 +919,7 @@
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
"@@@STEP_LOG_LINE@request@ \"git_branch\": \"master\",@@@",
"@@@STEP_LOG_LINE@request@ \"git_ref\": \"refs/pull/1/head\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Linux\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Linux abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [],@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json b/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
index 2ee227f..0ab6cf0 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/artifact exists.json
@@ -38,7 +38,7 @@
],
"infra_step": true,
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Engine Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"test/repo\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"0\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Engine Drone\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"test/repo\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"0\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -89,6 +89,7 @@
"@@@STEP_LOG_LINE@request@ \"artifact\": \"def\",@@@",
"@@@STEP_LOG_LINE@request@ \"dependencies\": [],@@@",
"@@@STEP_LOG_LINE@request@ \"git_branch\": \"master\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Linux\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Linux abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [],@@@",
"@@@STEP_LOG_LINE@request@ \"task_name\": \"abc\"@@@",
@@ -103,6 +104,7 @@
"@@@STEP_LOG_LINE@request@ \"git_branch\": \"master\",@@@",
"@@@STEP_LOG_LINE@request@ \"git_ref\": \"refs/pull/1/head\",@@@",
"@@@STEP_LOG_LINE@request@ \"git_url\": \"test/repo\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Linux\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Linux abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [],@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
index 9e30027..36b479a 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
@@ -1028,7 +1028,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"local_engine\": \"android-release\", \"local_engine_cas_hash\": \"isolatehashlocalengine/22\", \"local_engine_host\": \"host-release\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Linux Engine Drone\", \"project\": \"test\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"git.example.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"test/repo\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {}, \"artifact\": \"def\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"tags\": [], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Linux\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"local_engine\": \"android-release\", \"local_engine_cas_hash\": \"isolatehashlocalengine/22\", \"local_engine_host\": \"host-release\", \"os\": \"Linux\", \"parent_builder\": \"Linux abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1089,6 +1089,7 @@
"@@@STEP_LOG_LINE@request@ \"artifact\": \"def\",@@@",
"@@@STEP_LOG_LINE@request@ \"dependencies\": [],@@@",
"@@@STEP_LOG_LINE@request@ \"git_branch\": \"master\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Linux\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Linux abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [],@@@",
"@@@STEP_LOG_LINE@request@ \"task_name\": \"abc\"@@@",
@@ -1104,6 +1105,7 @@
"@@@STEP_LOG_LINE@request@ \"local_engine\": \"android-release\",@@@",
"@@@STEP_LOG_LINE@request@ \"local_engine_cas_hash\": \"isolatehashlocalengine/22\",@@@",
"@@@STEP_LOG_LINE@request@ \"local_engine_host\": \"host-release\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Linux\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Linux abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [],@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
index 9aadaed..cfc1b9d 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -2051,7 +2051,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Mac Engine Drone\", \"project\": \"project\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"chromium.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"project\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"dependencies\": [], \"git_branch\": \"master\", \"parent_builder\": \"Mac_ios abc\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Mac\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"parent_builder\": \"Mac_ios abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"Mac Engine Drone\", \"project\": \"project\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Mac\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"chromium.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"project\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"build\": {\"drone_dimensions\": [\"os=Mac\"], \"name\": \"abc\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"deadbeef\"}, \"artifact\": \"abc\", \"dependencies\": [], \"git_branch\": \"master\", \"os\": \"Mac\", \"parent_builder\": \"Mac_ios abc\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"recipe\": \"devicelab/devicelab_test_drone\"}, \"dependencies\": [], \"drone_dimensions\": [\"os=Mac\"], \"gclient_variables\": {}, \"git_branch\": \"master\", \"os\": \"Mac\", \"parent_builder\": \"Mac_ios abc\", \"recipe\": \"devicelab/devicelab_test_drone\", \"tags\": [\"ios\"], \"task_name\": \"abc\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2116,6 +2116,7 @@
"@@@STEP_LOG_LINE@request@ \"artifact\": \"abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"dependencies\": [],@@@",
"@@@STEP_LOG_LINE@request@ \"git_branch\": \"master\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Mac\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Mac_ios abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
"@@@STEP_LOG_LINE@request@ \"ios\"@@@",
@@ -2130,6 +2131,7 @@
"@@@STEP_LOG_LINE@request@ ],@@@",
"@@@STEP_LOG_LINE@request@ \"gclient_variables\": {},@@@",
"@@@STEP_LOG_LINE@request@ \"git_branch\": \"master\",@@@",
+ "@@@STEP_LOG_LINE@request@ \"os\": \"Mac\",@@@",
"@@@STEP_LOG_LINE@request@ \"parent_builder\": \"Mac_ios abc\",@@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"devicelab/devicelab_test_drone\",@@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
diff --git a/recipes/devicelab/devicelab_drone_build_test.py b/recipes/devicelab/devicelab_drone_build_test.py
index 0362206..414c741 100644
--- a/recipes/devicelab/devicelab_drone_build_test.py
+++ b/recipes/devicelab/devicelab_drone_build_test.py
@@ -113,9 +113,13 @@
api.properties.get('$flutter/osx_sdk', {})
),
}
+ drone_dimensions = api.properties.get('drone_dimensions', [])
+ for d in drone_dimensions:
+ k, v = d.split('=')
+ test_props[k] = v
reqs.append({
'name': task_name, 'properties': test_props,
- 'drone_dimensions': api.properties.get('drone_dimensions', []),
+ 'drone_dimensions': drone_dimensions,
'recipe': 'devicelab/devicelab_test_drone'
})
return reqs
diff --git a/recipes/devicelab/devicelab_test_drone.py b/recipes/devicelab/devicelab_test_drone.py
index 52a4f0b..49febc8 100644
--- a/recipes/devicelab/devicelab_test_drone.py
+++ b/recipes/devicelab/devicelab_test_drone.py
@@ -125,6 +125,10 @@
if str(api.swarming.bot_id).startswith('flutter-devicelab'):
with api.osx_sdk('ios', devicelab=True):
with api.context(env=env, env_prefixes=env_prefixes):
+ # Next steps get executed only if running in mac.
+ api.os_utils.prepare_ios_device()
+ api.os_utils.shutdown_simulators()
+ api.os_utils.ios_debug_symbol_doctor()
run_test(api, task_name, runner_params)
with api.context(env=env, env_prefixes=env_prefixes, cwd=devicelab_path):
