From 9471087f538e73232e3a35f09bc5163b3af6ce43 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Wed, 30 Nov 2022 12:55:23 -0800 Subject: [PATCH] Switch from android 9 to 10 for tests --- BAZEL_MIGRATION.md | 2 +- e2e/karma.conf.js | 6 +++--- e2e/script_tag_tests/tfjs-core-cpu/karma.conf.js | 6 +++--- e2e/script_tag_tests/tfjs/karma.conf.js | 6 +++--- e2e/scripts/test-ci.sh | 2 +- tfjs-backend-wasm/BUILD.bazel | 2 +- tfjs-backend-webgl/BUILD.bazel | 4 ++-- tfjs-backend-webgl/scripts/test-ci.sh | 2 +- tfjs-core/BUILD.bazel | 2 +- tfjs-core/src/BUILD.bazel | 4 ++-- tfjs-layers/BUILD.bazel | 4 ++-- tfjs-tfdf/BUILD.bazel | 2 +- tfjs-tflite/src/BUILD.bazel | 2 +- tools/karma_template.conf.js | 6 +++--- tools/tfjs_web_test.bzl | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/BAZEL_MIGRATION.md b/BAZEL_MIGRATION.md index 2cdaaf6bb2..e4fea32197 100644 --- a/BAZEL_MIGRATION.md +++ b/BAZEL_MIGRATION.md @@ -211,7 +211,7 @@ tfjs_web_test( "bs_firefox_mac", "bs_safari_mac", "bs_ios_12", - "bs_android_9", + "bs_android_10", "win_10_chrome", ], static_files = [ diff --git a/e2e/karma.conf.js b/e2e/karma.conf.js index 87e49d1c7c..f284384bbb 100644 --- a/e2e/karma.conf.js +++ b/e2e/karma.conf.js @@ -176,11 +176,11 @@ module.exports = function(config) { os_version: '11.0', real_mobile: true }, - bs_android_9: { + bs_android_10: { base: 'BrowserStack', - device: 'Google Pixel 3 XL', + device: 'Google Pixel 4 XL', os: 'android', - os_version: '9.0', + os_version: '10.0', real_mobile: true }, win_10_chrome: { diff --git a/e2e/script_tag_tests/tfjs-core-cpu/karma.conf.js b/e2e/script_tag_tests/tfjs-core-cpu/karma.conf.js index 367b8b71c6..b8e4b406cd 100644 --- a/e2e/script_tag_tests/tfjs-core-cpu/karma.conf.js +++ b/e2e/script_tag_tests/tfjs-core-cpu/karma.conf.js @@ -104,11 +104,11 @@ module.exports = function(config) { os_version: '11.0', real_mobile: true }, - bs_android_9: { + bs_android_10: { base: 'BrowserStack', - device: 'Google Pixel 3 XL', + device: 'Google Pixel 4 XL', os: 'android', - os_version: '9.0', + os_version: '10.0', real_mobile: true }, win_10_chrome: { diff --git a/e2e/script_tag_tests/tfjs/karma.conf.js b/e2e/script_tag_tests/tfjs/karma.conf.js index ce54c3a252..6b04333851 100644 --- a/e2e/script_tag_tests/tfjs/karma.conf.js +++ b/e2e/script_tag_tests/tfjs/karma.conf.js @@ -96,11 +96,11 @@ module.exports = function(config) { os_version: '11.0', real_mobile: true }, - bs_android_9: { + bs_android_10: { base: 'BrowserStack', - device: 'Google Pixel 3 XL', + device: 'Google Pixel 4 XL', os: 'android', - os_version: '9.0', + os_version: '10.0', real_mobile: true }, win_10_chrome: { diff --git a/e2e/scripts/test-ci.sh b/e2e/scripts/test-ci.sh index 9f7b430f2d..bda4a6f739 100755 --- a/e2e/scripts/test-ci.sh +++ b/e2e/scripts/test-ci.sh @@ -61,7 +61,7 @@ if [[ "$NIGHTLY" = true || "$RELEASE" = true ]]; then node ../scripts/run_flaky.js "yarn run-browserstack --browsers=bs_firefox_mac --tags '$TAGS'" node ../scripts/run_flaky.js "yarn run-browserstack --browsers=bs_chrome_mac --tags '$TAGS'" - node ../scripts/run_flaky.js "yarn run-browserstack --browsers=bs_android_9 --tags '$TAGS'" + node ../scripts/run_flaky.js "yarn run-browserstack --browsers=bs_android_10 --tags '$TAGS'" # Test script tag bundles node ../scripts/run_flaky.js "karma start ./script_tag_tests/tfjs-core-cpu/karma.conf.js --browserstack --browsers=bs_chrome_mac" diff --git a/tfjs-backend-wasm/BUILD.bazel b/tfjs-backend-wasm/BUILD.bazel index 7728e095da..5d2ec29a61 100644 --- a/tfjs-backend-wasm/BUILD.bazel +++ b/tfjs-backend-wasm/BUILD.bazel @@ -155,7 +155,7 @@ tfjs_web_test( "bs_safari_mac", "bs_ios_12", # TODO(mattsoulanille): Fix clipByValue on Android. - # "bs_android_9", + # "bs_android_10", "win_10_chrome", ], static_files = [ diff --git a/tfjs-backend-webgl/BUILD.bazel b/tfjs-backend-webgl/BUILD.bazel index db5a7c8978..355de6f7cc 100644 --- a/tfjs-backend-webgl/BUILD.bazel +++ b/tfjs-backend-webgl/BUILD.bazel @@ -108,13 +108,13 @@ tfjs_web_test( browsers = [ "bs_chrome_mac", "bs_firefox_mac", - "bs_android_9", + "bs_android_10", "win_10_chrome", ], headless = False, presubmit_browsers = [ "bs_chrome_mac", - "bs_android_9", + "bs_android_10", ], static_files = STATIC_FILES, ) diff --git a/tfjs-backend-webgl/scripts/test-ci.sh b/tfjs-backend-webgl/scripts/test-ci.sh index a3ae15f941..5ea001789a 100755 --- a/tfjs-backend-webgl/scripts/test-ci.sh +++ b/tfjs-backend-webgl/scripts/test-ci.sh @@ -19,7 +19,7 @@ set -e if [ "$NIGHTLY" = true ]; then node ../scripts/run_flaky.js "yarn run-browserstack --browsers='bs_safari_mac,bs_ios_12' --testEnv webgl1" node ../scripts/run_flaky.js "yarn run-browserstack --browsers='bs_firefox_mac,bs_chrome_mac'" - node ../scripts/run_flaky.js "yarn run-browserstack --browsers='win_10_chrome,bs_android_9' --testEnv webgl2" + node ../scripts/run_flaky.js "yarn run-browserstack --browsers='win_10_chrome,bs_android_10' --testEnv webgl2" node ../scripts/run_flaky.js "yarn run-browserstack --browsers=bs_chrome_mac --testEnv webgl2 --flags '{"\""WEBGL_PACK"\"": false}'" node ../scripts/run_flaky.js "yarn run-browserstack --browsers=bs_chrome_mac --testEnv webgl2 --flags '{"\""WEBGL_CPU_FORWARD"\"": true}'" node ../scripts/run_flaky.js "yarn run-browserstack --browsers=bs_chrome_mac --testEnv webgl2 --flags '{"\""WEBGL_USE_SHAPES_UNIFORMS"\"": true}'" diff --git a/tfjs-core/BUILD.bazel b/tfjs-core/BUILD.bazel index f7e4424439..f56c0a6e6f 100644 --- a/tfjs-core/BUILD.bazel +++ b/tfjs-core/BUILD.bazel @@ -114,7 +114,7 @@ tfjs_web_test( "bs_firefox_mac", "bs_safari_mac", "bs_ios_12", - "bs_android_9", + "bs_android_10", "win_10_chrome", ], static_files = [ diff --git a/tfjs-core/src/BUILD.bazel b/tfjs-core/src/BUILD.bazel index 8048203606..49001f47fb 100644 --- a/tfjs-core/src/BUILD.bazel +++ b/tfjs-core/src/BUILD.bazel @@ -207,7 +207,7 @@ tfjs_web_test( # absolute paths in iOS, which is required for loading the worker. # https://www.browserstack.com/question/39573 # "bs_ios_12", - "bs_android_9", + "bs_android_10", "win_10_chrome", ], static_files = [ @@ -247,7 +247,7 @@ tfjs_web_test( # absolute paths in iOS, which is required for loading the worker. # https://www.browserstack.com/question/39573 # "bs_ios_12", - "bs_android_9", + "bs_android_10", "win_10_chrome", ], static_files = [ diff --git a/tfjs-layers/BUILD.bazel b/tfjs-layers/BUILD.bazel index d7f830ffa5..1664429bd6 100644 --- a/tfjs-layers/BUILD.bazel +++ b/tfjs-layers/BUILD.bazel @@ -52,8 +52,8 @@ tfjs_web_test( browsers = [ "bs_chrome_mac", "bs_firefox_mac", - # disabled android 9 test due to training flakiness - # "bs_android_9", + # disabled android test due to training flakiness + # "bs_android_10", "win_10_chrome", ], headless = False, diff --git a/tfjs-tfdf/BUILD.bazel b/tfjs-tfdf/BUILD.bazel index 5f39e913f3..b133797af4 100644 --- a/tfjs-tfdf/BUILD.bazel +++ b/tfjs-tfdf/BUILD.bazel @@ -108,7 +108,7 @@ tfjs_web_test( # TODO: Support Safari. "bs_chrome_mac", "bs_firefox_mac", - "bs_android_9", + "bs_android_10", "win_10_chrome", ], static_files = [ diff --git a/tfjs-tflite/src/BUILD.bazel b/tfjs-tflite/src/BUILD.bazel index 57efb30fa5..6ceb62f6df 100644 --- a/tfjs-tflite/src/BUILD.bazel +++ b/tfjs-tflite/src/BUILD.bazel @@ -110,7 +110,7 @@ tfjs_web_test( # absolute paths in iOS, which is required for loading the worker. # https://www.browserstack.com/question/39573 # "bs_ios_12", - "bs_android_9", + "bs_android_10", "win_10_chrome", ], static_files = [ diff --git a/tools/karma_template.conf.js b/tools/karma_template.conf.js index dfdad4e19b..1aa568b2e4 100644 --- a/tools/karma_template.conf.js +++ b/tools/karma_template.conf.js @@ -54,11 +54,11 @@ const CUSTOM_LAUNCHERS = { os_version: '12.3', real_mobile: true }, - bs_android_9: { + bs_android_10: { base: 'BrowserStack', - device: 'Google Pixel 3 XL', + device: 'Google Pixel 4 XL', os: 'android', - os_version: '9.0', + os_version: '10.0', real_mobile: true }, win_10_chrome: { diff --git a/tools/tfjs_web_test.bzl b/tools/tfjs_web_test.bzl index 66dea6272a..8df6a5a02e 100644 --- a/tools/tfjs_web_test.bzl +++ b/tools/tfjs_web_test.bzl @@ -125,7 +125,7 @@ def tfjs_web_test(name, ci = True, args = [], **kwargs): "bs_firefox_mac", "bs_safari_mac", "bs_ios_12", - "bs_android_9", + "bs_android_10", "win_10_chrome", ])