update workflows: generalize Android CI to dynamically use matrix-based configuration files across all steps

Author: allnes

.github/workflows/e2e-android-test.yml

@@ -30,9 +30,11 @@ jobs:
           - os: ubuntu-latest  # Ubuntu
             android-api: 30
             arch: x86_64
+            config_file: experiments/android_x86_64_ci.yaml
 #          - os: macOS-latest  # macOS on Apple Silicon (M1/M2)
 #            android-api: 30
 #            arch: arm64
+#            config_file: experiments/android_example.yaml
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -111,12 +113,13 @@ jobs:
             rm -rf $HOME/ovmb_cache/models 2>/dev/null || true
           fi
 
-          # Use x86_64 config for CI
-          CONFIG_FILE="experiments/android_x86_64_ci.yaml"
-          echo "📱 Using x86_64 configuration for CI: $CONFIG_FILE"
+          # Use config file from matrix
+          echo "📱 Using configuration: ${{ matrix.config_file }}"
+          echo "  Architecture: ${{ matrix.arch }}"
+          echo "  OS: ${{ matrix.os }}"
 
           python -m ovmobilebench.cli setup-android \
-            -c $CONFIG_FILE \
+            -c ${{ matrix.config_file }} \
             --api ${{ matrix.android-api }} \
             --create-avd \
             --verbose
@@ -128,8 +131,8 @@ jobs:
       # === PREPARE EMULATOR ===
       - name: Start Android Emulator
         run: |
-          python tests/e2e/test_emulator_helper.py -c experiments/android_x86_64_ci.yaml start-emulator &
-          python tests/e2e/test_emulator_helper.py -c experiments/android_x86_64_ci.yaml wait-for-boot
+          python tests/e2e/test_emulator_helper.py -c ${{ matrix.config_file }} start-emulator &
+          python tests/e2e/test_emulator_helper.py -c ${{ matrix.config_file }} wait-for-boot
 
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -142,7 +145,7 @@ jobs:
 
       # === PREPARE MODEL ===
       - name: Download ResNet-50 model
-        run: python tests/e2e/test_model_helper.py -c experiments/android_x86_64_ci.yaml download-resnet50
+        run: python tests/e2e/test_model_helper.py -c ${{ matrix.config_file }} download-resnet50
 
       # === OVMOBILEBENCH PIPELINE ===
       - name: List available devices
@@ -151,7 +154,7 @@ jobs:
       - name: Build OpenVINO for Android
         run: |
           python -m ovmobilebench.cli build \
-            -c experiments/android_x86_64_ci.yaml \
+            -c ${{ matrix.config_file }} \
             --verbose
 
       - name: Show ccache statistics
@@ -162,33 +165,33 @@ jobs:
       - name: Package OpenVINO runtime and model
         run: |
           python -m ovmobilebench.cli package \
-            -c experiments/android_x86_64_ci.yaml \
+            -c ${{ matrix.config_file }} \
             --verbose
 
       - name: Deploy to Android device
         run: |
           python -m ovmobilebench.cli deploy \
-            -c experiments/android_x86_64_ci.yaml \
+            -c ${{ matrix.config_file }} \
             --verbose
 
       - name: Run benchmark on device
         run: |
           python -m ovmobilebench.cli run \
-            -c experiments/android_x86_64_ci.yaml \
+            -c ${{ matrix.config_file }} \
             --verbose
 
       - name: Generate benchmark report
         run: |
           python -m ovmobilebench.cli report \
-            -c experiments/android_x86_64_ci.yaml \
+            -c ${{ matrix.config_file }} \
             --verbose
 
       # === ALTERNATIVE: Run all stages at once ===
       - name: Run complete pipeline (alternative)
         if: false  # Set to true to use this instead of individual stages
         run: |
           python -m ovmobilebench.cli all \
-            -c experiments/android_x86_64_ci.yaml \
+            -c ${{ matrix.config_file }} \
             --verbose
 
       # === VALIDATION ===
@@ -201,7 +204,7 @@ jobs:
       # === CLEANUP ===
       - name: Stop emulator
         if: always()
-        run: python tests/e2e/test_emulator_helper.py -c experiments/android_x86_64_ci.yaml stop-emulator
+        run: python tests/e2e/test_emulator_helper.py -c ${{ matrix.config_file }} stop-emulator
 
       - name: Upload artifacts
         if: always()

ovmobilebench/cli.py

@@ -220,6 +220,9 @@ def setup_android(
         "experiments/android_example.yaml", "-c", "--config", help="Path to configuration file"
     ),
     api_level: int = typer.Option(None, "--api", help="Android API level (overrides config)"),
+    arch: str = typer.Option(
+        None, "--arch", help="Architecture (x86_64, arm64-v8a) (overrides config)"
+    ),
     create_avd: bool = typer.Option(
         None, "--create-avd", help="Create AVD for emulator (overrides config)"
     ),
@@ -233,7 +236,7 @@ def setup_android(
 ):
     """Setup Android SDK/NDK for OVMobileBench."""
     from ovmobilebench.android.installer.api import ensure_android_tools, verify_installation
-    from ovmobilebench.android.installer.types import NdkSpec
+    from ovmobilebench.android.installer.types import Arch, NdkSpec
     from ovmobilebench.config.loader import load_experiment
 
     # Load config
@@ -244,6 +247,12 @@ def setup_android(
             api_level = (
                 experiment.device.api_level if hasattr(experiment.device, "api_level") else 30
             )
+        if arch is None:
+            # Get architecture from openvino.toolchain.abi in config
+            if hasattr(experiment, "openvino") and hasattr(experiment.openvino, "toolchain"):
+                arch = experiment.openvino.toolchain.abi
+            else:
+                arch = "x86_64"  # Default for CI
         if create_avd is None:
             # Default: create AVD only if no physical devices specified in config
             create_avd = (
@@ -261,6 +270,8 @@ def setup_android(
         console.print(f"[yellow]Warning: Could not load config: {e}[/yellow]")
         if api_level is None:
             api_level = 30
+        if arch is None:
+            arch = "x86_64"  # Default for CI
         if create_avd is None:
             create_avd = False
         if sdk_root is None:
@@ -283,7 +294,7 @@ def setup_android(
         system_images = verification_result.get("system_images", [])
         ndk_versions = verification_result.get("ndk_versions", [])
 
-        required_system_image = f"system-images;android-{api_level};google_apis;arm64-v8a"
+        required_system_image = f"system-images;android-{api_level};google_apis;{arch}"
         has_system_image = any(required_system_image in img for img in system_images)
 
         # Check what needs to be installed
@@ -327,11 +338,13 @@ def setup_android(
         console.print("Using latest available NDK version")
 
     try:
+        # Cast arch to proper type
+        arch_typed: Arch = arch  # type: ignore
         result = ensure_android_tools(
             sdk_root=sdk_root,
             api=api_level,
             target="google_apis",
-            arch="arm64-v8a",
+            arch=arch_typed,
             ndk=NdkSpec(alias=ndk_alias),
             install_platform_tools=True,
             install_emulator=True,

tests/e2e/test_emulator_helper.py

@@ -119,7 +119,13 @@ def start_emulator(avd_name: str = None, api_level: int = 30):
     elif platform.system() == "Darwin":  # macOS
         cmd.extend(["-accel", "on"])
 
-    subprocess.Popen(cmd)
+    # Set environment variables for AVD location
+    env = os.environ.copy()
+    env["ANDROID_SDK_ROOT"] = ANDROID_HOME
+    env["ANDROID_HOME"] = ANDROID_HOME
+    env["ANDROID_AVD_HOME"] = str(Path(ANDROID_HOME) / "avd")
+
+    subprocess.Popen(cmd, env=env)
     logger.info("Emulator started in background")