mobile/ci: Deflake Android tests (envoyproxy#30161)

Signed-off-by: Fredy Wijaya <[email protected]>
fredyw · Oct 13, 2023 · 6ef1bb4 · 6ef1bb4
1 parent 1a9e559
commit 6ef1bb4
Show file tree

Hide file tree

Showing 14 changed files with 337 additions and 162 deletions.
diff --git a/.github/workflows/mobile-android_tests.yml b/.github/workflows/mobile-android_tests.yml
@@ -21,76 +21,37 @@ jobs:
     permissions:
       contents: read
 
-  kotlintestsmac:
+  javatestslinux:
     if: ${{ needs.env.outputs.mobile_android_tests == 'true' }}
     needs: env
     permissions:
       contents: read
       packages: read
-    # revert to //test/kotlin/... once fixed
-    # https://github.com/envoyproxy/envoy-mobile/issues/1932
-    name: kotlin_tests_mac
-    runs-on: macos-12
+    name: java_tests_linux
+    runs-on: ${{ needs.env.outputs.agent_ubuntu }}
     timeout-minutes: 90
     steps:
+    - name: Pre-cleanup
+      # Using the defaults in
+      # https://github.com/envoyproxy/toolshed/blob/main/gh-actions/diskspace/action.yml.
+      uses: envoyproxy/toolshed/gh-actions/[email protected]
     - uses: actions/checkout@v4
-    - name: 'Java setup'
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
-      with:
-        java-version: '8'
-        java-package: jdk
-        architecture: x64
-        distribution: zulu
-    - name: 'Install dependencies'
-      run: |
-        cd mobile
-        ./ci/mac_ci_setup.sh
-    - name: 'Run Kotlin library tests'
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        cd mobile
-        ./bazelw test \
-            --build_tests_only \
-            --config=mobile-remote-ci-macos \
-            --define=signal_trace=disabled \
-            //test/kotlin/io/...
-
-  javatestsmac:
-    if: ${{ needs.env.outputs.mobile_android_tests == 'true' }}
-    needs: env
-    permissions:
-      contents: read
-      packages: read
-    name: java_tests_mac
-    runs-on: macos-12
-    timeout-minutes: 120
-    steps:
-    - uses: actions/checkout@v4
-    - name: 'Java setup'
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0
-      with:
-        java-version: '8'
-        java-package: jdk
-        architecture: x64
-        distribution: zulu
-    - name: 'Install dependencies'
-      run: |
-        cd mobile
-        ./ci/mac_ci_setup.sh
-    - name: 'Run Java library tests'
+    - name: Add safe directory
+      run: git config --global --add safe.directory /__w/envoy/envoy
+    - name: 'Run Kotlin library integration tests'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CC: /opt/llvm/bin/clang
+        CXX: /opt/llvm/bin/clang++
       run: |
-        cd mobile
-        ./bazelw test \
-            --build_tests_only \
-            --config test-android \
-            --define envoy_mobile_listener=enabled \
-            --config=mobile-remote-ci-macos \
-            --define=signal_trace=disabled \
-            --define=system-helper=android \
-            //test/java/...
+        docker run --volume="${PWD}:/source" --workdir="/source/mobile" \
+          -e GITHUB_TOKEN -e CC -e CXX ${{ needs.env.outputs.build_image_ubuntu_mobile }} \
+          ./bazelw test \
+          --build_tests_only \
+          --config=test-android \
+          --config=mobile-remote-ci \
+          --define=signal_trace=disabled \
+          //test/java/...
 
   kotlintestslinux:
     if: ${{ needs.env.outputs.mobile_android_tests == 'true' }}

diff --git a/mobile/bazel/kotlin_test.bzl b/mobile/bazel/kotlin_test.bzl
@@ -44,14 +44,13 @@ def jvm_flags(lib_name):
 
 # A basic macro to make it easier to declare and run kotlin tests which depend on a JNI lib
 # This will create the native .so binary (for linux) and a .jnilib (for macOS) look up
-def envoy_mobile_jni_kt_test(name, srcs, native_deps = [], deps = [], repository = "", exec_properties = {}):
-    lib_name = native_lib_name(native_deps[0])[3:]
+def envoy_mobile_jni_kt_test(name, srcs, native_lib_name, native_deps = [], deps = [], repository = "", exec_properties = {}):
     _internal_kt_test(
         name,
         srcs,
         deps,
         data = native_deps,
-        jvm_flags = jvm_flags(lib_name),
+        jvm_flags = jvm_flags(native_lib_name),
         repository = repository,
         exec_properties = exec_properties,
     )
@@ -76,8 +75,7 @@ def envoy_mobile_kt_test(name, srcs, deps = [], repository = "", exec_properties
     _internal_kt_test(name, srcs, deps, repository = repository, exec_properties = exec_properties)
 
 # A basic macro to run android based (robolectric) tests with native dependencies
-def envoy_mobile_android_test(name, srcs, deps = [], native_deps = [], repository = "", exec_properties = {}):
-    lib_name = native_lib_name(native_deps[0])[3:]
+def envoy_mobile_android_test(name, srcs, native_lib_name, deps = [], native_deps = [], repository = "", exec_properties = {}):
     android_library(
         name = name + "_test_lib",
         custom_package = "io.envoyproxy.envoymobile.test",
@@ -114,6 +112,6 @@ def envoy_mobile_android_test(name, srcs, deps = [], native_deps = [], repositor
         manifest = repository + "//bazel:test_manifest.xml",
         custom_package = "io.envoyproxy.envoymobile.tests",
         test_class = "io.envoyproxy.envoymobile.bazel.EnvoyMobileTestSuite",
-        jvm_flags = jvm_flags(lib_name),
+        jvm_flags = jvm_flags(native_lib_name),
         exec_properties = exec_properties,
     )
diff --git a/mobile/test/java/integration/BUILD b/mobile/test/java/integration/BUILD
@@ -16,8 +16,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",
     ],
@@ -34,8 +39,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",
         "//test/java/io/envoyproxy/envoymobile/engine/testing",
@@ -53,8 +63,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",
         "//test/java/io/envoyproxy/envoymobile/engine/testing",
@@ -72,8 +87,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",
         "//test/java/io/envoyproxy/envoymobile/engine/testing",

diff --git a/mobile/test/java/io/envoyproxy/envoymobile/engine/BUILD b/mobile/test/java/io/envoyproxy/envoymobile/engine/BUILD
@@ -9,8 +9,13 @@ envoy_mobile_jni_kt_test(
     ],
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib",
         "//test/java/io/envoyproxy/envoymobile/engine/testing",
@@ -44,8 +49,13 @@ envoy_mobile_android_test(
     ],
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",

diff --git a/mobile/test/java/io/envoyproxy/envoymobile/engine/testing/BUILD b/mobile/test/java/io/envoyproxy/envoymobile/engine/testing/BUILD
@@ -32,8 +32,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         ":testing",
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",

diff --git a/mobile/test/java/io/envoyproxy/envoymobile/utilities/BUILD b/mobile/test/java/io/envoyproxy/envoymobile/utilities/BUILD
@@ -12,8 +12,13 @@ envoy_mobile_android_test(
     ],
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",

diff --git a/mobile/test/java/org/chromium/net/BUILD b/mobile/test/java/org/chromium/net/BUILD
@@ -23,8 +23,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",
@@ -48,8 +53,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",
@@ -72,8 +82,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",
@@ -96,8 +111,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",

diff --git a/mobile/test/java/org/chromium/net/impl/BUILD b/mobile/test/java/org/chromium/net/impl/BUILD
@@ -21,8 +21,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",

diff --git a/mobile/test/java/org/chromium/net/testing/BUILD b/mobile/test/java/org/chromium/net/testing/BUILD
@@ -1,5 +1,5 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
 load("@envoy_mobile//bazel:kotlin_test.bzl", "envoy_mobile_android_test")
 
 licenses(["notice"])  # Apache 2
@@ -62,8 +62,13 @@ envoy_mobile_android_test(
     ],
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         ":testing",
         "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
@@ -85,8 +90,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         ":testing",
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",
@@ -104,8 +114,13 @@ envoy_mobile_android_test(
     },
     native_deps = [
         "//test/common/jni:libenvoy_jni_with_test_extensions.so",
-        "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
-    ],
+    ] + select({
+        "@platforms//os:macos": [
+            "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib",
+        ],
+        "//conditions:default": [],
+    }),
+    native_lib_name = "envoy_jni_with_test_extensions",
     deps = [
         ":testing",
         "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",