Switch from android 9 to 10 for tests

tensorflow · Nov 30, 2022 · 9471087 · 9471087
1 parent 9d28deb
commit 9471087
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",
     ])