[skip slack] [run tests] update image for tests

cake-tech · Jan 8, 2025 · 304201d · 304201d
1 parent e1f824f
commit 304201d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml
@@ -291,11 +291,12 @@ jobs:
         if: ${{ contains(github.event.head_commit.message, 'run tests') }}
         uses: reactivecircus/android-emulator-runner@v2
         with:
+          arch: 'x86_64'
           api-level: ${{ matrix.api-level }}
+          cores: 4
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
           script: |
-            chmod a+rx integration_test_runner.sh
             ./integration_test_runner.sh
   
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
@@ -394,9 +394,9 @@ Future<void> _updateNode({
   bool? useSSL,
 }) async {
   for (Node node in nodes.values) {
-    print("@@@@@@@@@@@@@");
-    print(node.uriRaw);
-    print(node.uri);
+    printV("@@@@@@@@@@@@@");
+    printV(node.uriRaw);
+    printV(node.uri);
     if (node.uriRaw == currentUri) {
       if (newUri != null) {
         node.uriRaw = newUri;

diff --git a/scripts/linux/Dockerfile.linux b/scripts/linux/Dockerfile.linux
@@ -48,6 +48,8 @@ RUN set -o xtrace \
     && apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev \
     # monero_c dependencies
     && apt-get install -y ccache build-essential autoconf libtool gperf llvm \
+    # extra stuff for KVM
+    && apt-get install -y udev \
     && rm -rf /var/lib/apt/lists/* \
     && sh -c 'echo "en_US.UTF-8 UTF-8" > /etc/locale.gen' \
     && locale-gen \
@@ -97,14 +99,27 @@ RUN yes | sdkmanager \
     "platforms;android-33" \
     "build-tools;33.0.2" \
     "build-tools;33.0.1" \
-    "build-tools;33.0.0"
+    "build-tools;33.0.0" \
+    "build-tools;35.0.0"
 
 ENV ANDROID_NDK_VERSION=27.2.12479018
 
 # Extra ndk dependency for sp_scanner
 RUN yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
     "ndk;27.0.12077973"
 
+# https://github.com/ReactiveCircus/android-emulator-runner dependencies for tests
+RUN yes | sdkmanager "system-images;android-29;default;x86" \
+    "system-images;android-29;default;x86_64" \
+    "system-images;android-31;default;x86_64" \
+    "platforms;android-29"
+
+# fake the KVM status so android emulator doesn't complain (that much)
+RUN (addgroup kvm || true) && \
+    adduser root kvm && \
+    mkdir -p /etc/udev/rules.d/ && \
+    echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | tee /etc/udev/rules.d/99-kvm4all.rules
+
 ENV PATH=${HOME}/.cargo/bin:${PATH}
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \