The greatest hack of all time

Author: MarkusPettersson98

.github/workflows/desktop-e2e.yml

@@ -135,12 +135,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      # - name: Setup Docker
-      #   uses: crazy-max/ghaction-setup-docker@v3
       - name: Build test framework
         working-directory: test
-      #  env:
-      #    CONTAINER_RUNNER: docker
         run: ./scripts/container-run.sh ./scripts/build.sh
       - uses: actions/upload-artifact@v3
         with:
@@ -169,6 +165,11 @@ jobs:
           path: ~/.cache/mullvad-test/packages
       - name: Checkout repository
         uses: actions/checkout@v4
+      - uses: actions/download-artifact@v3
+        if: ${{ needs.test-framework-linux.result == 'success' }}
+        with:
+          name: test-framework-linux
+          path: ./test/dist
       - name: Run end-to-end tests
         shell: bash -ieo pipefail {0}
         run: |

test/scripts/ci-runtests.sh

@@ -44,15 +44,15 @@ nice_time download_app_package "$LATEST_STABLE_RELEASE" "$TEST_OS"
 nice_time download_app_package "$CURRENT_VERSION" "$TEST_OS"
 nice_time download_e2e_executable "$CURRENT_VERSION" "$TEST_OS"
 
-echo "**********************************"
-echo "* Building test manager"
-echo "**********************************"
-
-cargo build -p test-manager
-
-echo "**********************************"
-echo "* Running tests"
-echo "**********************************"
+# TMP: Assume test-manager has been built already!
+# If we are testing Linux, spood that we compile test-manager and test-runner. Actually use-precompiled artifacts.
+if ! is_linux "$TEST_OS" ; then
+    echo "**********************************"
+    echo "* Building test manager"
+    echo "**********************************"
+
+    cargo build -p test-manager
+fi
 
 mkdir -p "$CI_LOGS_DIR/os/"
 export TEST_REPORT="$CI_LOGS_DIR/${TEST_OS}_report"

test/scripts/test-utils.sh

@@ -24,7 +24,9 @@ LATEST_STABLE_RELEASE=$(jq -r '[.[] | select(.prerelease==false)] | .[0].tag_nam
 function get_current_version {
     local app_dir
     app_dir="$(get_test_utls_dir)/../.."
-    cargo run -q --manifest-path="$app_dir/Cargo.toml" --bin mullvad-version
+    # HACK:
+    echo "2024.4-dev-7781ac"
+    # cargo run -q --manifest-path="$app_dir/Cargo.toml" --bin mullvad-version
 }
 
 CURRENT_VERSION=$(get_current_version)
@@ -150,6 +152,13 @@ function download_app_package {
     fi
 }
 
+function is_linux {
+    case $1 in
+        debian*|ubuntu*|fedora*) true ;;
+        *) false ;;
+    esac
+}
+
 function get_e2e_filename {
     local version=$1
     local os=$2
@@ -224,11 +233,15 @@ function run_tests_for_os {
         exit 1
     fi
 
-    echo "**********************************"
-    echo "* Building test runner"
-    echo "**********************************"
+    # TMP: Assume test-manager has been built already!
+    # If we are testing Linux, spood that we compile test-manager and test-runner. Actually use-precompiled artifacts.
+    if ! is_linux "$TEST_OS" ; then
+        echo "**********************************"
+        echo "* Building test runner"
+        echo "**********************************"
 
-    nice_time build_test_runner "$vm"
+        nice_time build_test_runner "$vm"
+    fi
 
 
     echo "**********************************"
@@ -255,7 +268,11 @@ function run_tests_for_os {
     local test_dir
     test_dir=$(get_test_utls_dir)/..
     pushd "$test_dir"
-        if ! RUST_LOG_STYLE=always cargo run --bin test-manager \
+        TEST_MANAGER_BIN="cargo run --bin test-manager"
+        if is_linux "$vm" ; then
+            TEST_MANAGER_BIN="./dist/test-manager"
+        fi
+        if ! RUST_LOG_STYLE=always "$TEST_MANAGER_BIN" \
             run-tests \
             --account "${ACCOUNT_TOKEN:?Error: ACCOUNT_TOKEN not set}" \
             --app-package "${APP_PACKAGE:?Error: APP_PACKAGE not set}" \
@@ -278,7 +295,7 @@ function build_current_version {
     app_dir="$(get_test_utls_dir)/../.."
     local app_filename
     # TODO: TEST_OS must be set to local OS manually, should be set automatically
-    app_filename=$(get_app_filename "$CURRENT_VERSION" "${TEST_OS:?Error: TEST_OS not set}") 
+    app_filename=$(get_app_filename "$CURRENT_VERSION" "${TEST_OS:?Error: TEST_OS not set}")
     local package_dir
     package_dir=$(get_package_dir)
     local app_package="$package_dir"/"$app_filename"
@@ -309,4 +326,4 @@ function build_current_version {
     else
         echo "GUI e2e executable for current version already exists at $gui_test_bin, skipping build"
     fi
-}
+}

test/test-manager/src/config.rs

@@ -200,14 +200,22 @@ impl VmConfig {
         Some((self.ssh_user.as_ref()?, self.ssh_password.as_ref()?))
     }
 
-    pub fn get_runner_dir(&self) -> PathBuf {
-        let target_dir = self.get_target_dir();
-        let subdir = match self.architecture {
-            None | Some(Architecture::X64) => self.get_x64_runner_subdir(),
-            Some(Architecture::Aarch64) => self.get_aarch64_runner_subdir(),
-        };
-
-        target_dir.join(subdir)
+    // HACK: `use_precompiled`.
+    pub fn get_runner_dir(&self, use_precompiled: bool) -> PathBuf {
+        if use_precompiled {
+            Path::new(env!("CARGO_MANIFEST_DIR"))
+                .join("..")
+                .join("dist")
+                .to_path_buf()
+        } else {
+            let target_dir = self.get_target_dir();
+            let subdir = match self.architecture {
+                None | Some(Architecture::X64) => self.get_x64_runner_subdir(),
+                Some(Architecture::Aarch64) => self.get_aarch64_runner_subdir(),
+            };
+
+            target_dir.join(subdir)
+        }
     }
 
     fn get_x64_runner_subdir(&self) -> &Path {

test/test-manager/src/vm/provision.rs

@@ -25,7 +25,8 @@ pub async fn provision(
             provision_ssh(
                 instance,
                 config.os_type,
-                &config.get_runner_dir(),
+                // HACK: remove matches!
+                &config.get_runner_dir(matches!(config.os_type, OsType::Linux)),
                 app_manifest,
                 user,
                 password,