Drop device version tag for Skia benchmark metrics
This CL removes the device_version tag. No other changes are needed from SDK repo side. New data stream will be collected regardless of device versions.
Change-Id: I7cd7a1d81cafe10358e23281a48b1d94389aefae
Bug: https://github.com/flutter/flutter/issues/112804
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/34941
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/recipe_modules/test_utils/api.py b/recipe_modules/test_utils/api.py
index 3121ac4..153de2f 100644
--- a/recipe_modules/test_utils/api.py
+++ b/recipe_modules/test_utils/api.py
@@ -186,21 +186,18 @@
{
'arch': 'intel',
'host_type': 'linux',
- 'device_version': 'android-25',
'device_type': 'Moto G Play'
}
Mac/ios:
{
'arch': 'm1',
'host_type': 'mac',
- 'device_version': 'iOS-14.4.2',
'device_type': 'iPhone 6s'
}
Windows/android:
{
'arch': 'intel',
'host_type': 'win',
- 'device_version': 'android-25',
'device_type': 'Moto G Play'
}
"""
@@ -228,21 +225,17 @@
'Find device type', ['ideviceinfo', '--key', 'ProductType']
)
device_tags['device_type'] = IDENTIFIER_NAME_MAP[iphone_identifier]
- device_tags['device_version'] = 'iOS-' + _get_tag(
- 'Find device version', ['ideviceinfo', '--key', 'ProductVersion']
- )
elif 'android' in target_tags:
with self.m.context(env=env, env_prefixes=env_prefixes):
device_tags['device_type'] = _get_tag(
'Find device type', ['adb', 'shell', 'getprop', 'ro.product.model']
)
- device_tags['device_version'] = 'android-' + _get_tag(
- 'Find device version',
- ['adb', 'shell', 'getprop', 'ro.build.version.sdk']
- )
else:
device_tags['device_type'] = 'none'
- device_tags['device_version'] = 'none'
+
+ # Use same `none` as device version to consolidate metric data streams.
+ # Do not use real distinct values: https://github.com/flutter/flutter/issues/112804
+ device_tags['device_version'] = 'none'
device_tags['host_type'] = self.m.platform.name
device_tags['arch'] = self.m.platform.arch
diff --git a/recipe_modules/test_utils/examples/full.expected/flaky.json b/recipe_modules/test_utils/examples/full.expected/flaky.json
index 547edc2..97695ef 100644
--- a/recipe_modules/test_utils/examples/full.expected/flaky.json
+++ b/recipe_modules/test_utils/examples/full.expected/flaky.json
@@ -34,16 +34,6 @@
"name": "Find device type"
},
{
- "cmd": [
- "adb",
- "shell",
- "getprop",
- "ro.build.version.sdk"
- ],
- "infra_step": true,
- "name": "Find device version"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/test_utils/examples/full.expected/passing-mac.json b/recipe_modules/test_utils/examples/full.expected/passing-mac.json
index 52b9b0a..f66229f 100644
--- a/recipe_modules/test_utils/examples/full.expected/passing-mac.json
+++ b/recipe_modules/test_utils/examples/full.expected/passing-mac.json
@@ -32,15 +32,6 @@
"name": "Find device type"
},
{
- "cmd": [
- "ideviceinfo",
- "--key",
- "ProductVersion"
- ],
- "infra_step": true,
- "name": "Find device version"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index 56f73cf..5546614 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -411,46 +411,6 @@
},
{
"cmd": [
- "ideviceinfo",
- "--key",
- "ProductVersion"
- ],
- "env": {
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Find device version"
- },
- {
- "cmd": [
"flutter",
"doctor"
],
@@ -1775,7 +1735,7 @@
"--task-name",
"abc",
"--benchmark-tags",
- "{\"arch\": \"intel\", \"device_type\": \"iPhone 6s\", \"device_version\": \"iOS-\", \"host_type\": \"mac\"}",
+ "{\"arch\": \"intel\", \"device_type\": \"iPhone 6s\", \"device_version\": \"none\", \"host_type\": \"mac\"}",
"--service-account-token-file",
"[CLEANUP]/tmp_tmp_3"
],
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index 47a4120..8f79868 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -411,46 +411,6 @@
},
{
"cmd": [
- "ideviceinfo",
- "--key",
- "ProductVersion"
- ],
- "env": {
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Find device version"
- },
- {
- "cmd": [
"flutter",
"doctor"
],
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index fb0ea5c..07213d6 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -411,46 +411,6 @@
},
{
"cmd": [
- "ideviceinfo",
- "--key",
- "ProductVersion"
- ],
- "env": {
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Find device version"
- },
- {
- "cmd": [
"flutter",
"doctor"
],
