Android prebuild support (#211)

Author: borrrden

environment/aws/topology_setup/test_server_platforms/java_register.py

@@ -327,7 +327,13 @@ def create_bridge(self) -> PlatformBridge:
             PlatformBridge: The platform bridge.
         """
         path = (
-            JAK_TEST_SERVER_DIR
+            TEST_SERVER_DIR
+            / "downloaded"
+            / self.platform
+            / self.version
+            / "testserver_android.apk"
+            if self._downloaded
+            else JAK_TEST_SERVER_DIR
             / self.test_server_path
             / "app"
             / "build"

jenkins/pipelines/dev_e2e/android/Jenkinsfile

@@ -19,6 +19,20 @@ pipeline {
                 }
             }
         }
+        stage('Prebuild Server') {
+            steps {
+                script {
+                    build job: 'prebuild-test-server',
+                    parameters: [
+                        string(name: 'TS_PLATFORM', value: 'jak_android'),
+                        string(name: 'CBL_VERSION', value: params.CBL_VERSION),
+                        string(name: 'CBL_BUILD', value: params.CBL_BUILD)
+                    ],
+                    wait: true,
+                    propagate: true
+                }
+            }
+        }
         stage('Android') {
             agent { label 'mob-e2e-mac-01' }
             options {

jenkins/pipelines/dev_e2e/android/android_teardown.sh

@@ -7,7 +7,9 @@ source $SCRIPT_DIR/../../shared/config.sh
 
 export PYTHONPATH=$SCRIPT_DIR/../../../
 pushd $AWS_ENVIRONMENT_DIR
+stop_venv
 create_venv venv
 source venv/bin/activate
-pip install -r requirements.txt
+trap stop_venv EXIT
+uv pip install -r requirements.txt
 python3 ./stop_backend.py --topology topology_setup/topology.json

jenkins/pipelines/dev_e2e/android/android_tests.sh

@@ -33,27 +33,28 @@ yes | ${SDK_MGR} --channel=1 --licenses > /dev/null 2>&1
 ${SDK_MGR} --channel=1 --install "build-tools;${BUILD_TOOLS_VERSION}"
 PATH="${PATH}:$ANDROID_HOME/platform-tools"
 
+stop_venv
 create_venv venv
 source venv/bin/activate
-pip install -r $AWS_ENVIRONMENT_DIR/requirements.txt
+trap stop_venv EXIT
+uv pip install -r $AWS_ENVIRONMENT_DIR/requirements.txt
 if [ -n "$private_key_path" ]; then
     python3 $SCRIPT_DIR/setup_test.py $CBL_VERSION $DATASET_VERSION $SG_VERSION --private_key $private_key_path
 else
     python3 $SCRIPT_DIR/setup_test.py $CBL_VERSION $DATASET_VERSION $SG_VERSION
 fi
-deactivate
 
 echo "Start logcat"
 pushd $SCRIPT_DIR
 python3 logcat.py &
 echo $! > logcat.pid
 
 pushd $DEV_E2E_TESTS_DIR > /dev/null
-rm -rf venv http_log testserver.log
-create_venv venv
-source venv/bin/activate
-pip install -r requirements.txt
+rm -rf http_log testserver.log
+uv pip install -r requirements.txt
 
 echo "Run the tests"
-adb shell input keyevent KEYCODE_WAKEUP
+# To re-enable this, this script needs to become aware of the 
+# serial number of the device, which is not currently passed
+#adb shell input keyevent KEYCODE_WAKEUP
 pytest --maxfail=7 -W ignore::DeprecationWarning --config config.json

jenkins/pipelines/dev_e2e/android/topology_single_device.json

@@ -5,7 +5,8 @@
             "platform": "jak_android",
             "cbl_version": "{{version}}",
             "dataset_version": "{{dataset_version}}",
-            "location": "1BCACS00001MX3"
+            "location": "1BCACS00001MX3",
+            "download": true
         }
     ],
     "include": "../../../../environment/aws/topology_setup/default_topology.json"