Remove legacy provisioning for linux

mullvad · Jan 12, 2024 · d1ea65a · d1ea65a
1 parent 7836178
commit d1ea65a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/test/README.md b/test/README.md
@@ -53,7 +53,7 @@ For running tests on Linux and Windows guests, you will need these tools and lib
 
 ```bash
 dnf install git gcc protobuf-devel libpcap-devel qemu \
-    podman e2tools mingw64-gcc mingw64-winpthreads-static mtools \
+    podman mingw64-gcc mingw64-winpthreads-static mtools \
     golang-github-rootless-containers-rootlesskit slirp4netns dnsmasq \
     dbus-devel pkgconf-pkg-config swtpm edk2-ovmf \
     wireguard-tools
@@ -110,8 +110,7 @@ Here is an example of how to create a new OS configuration and then run all test
 # The image is assumed to contain a test runner service set up as described in ./docs/BUILD_OS_IMAGE.md
 cargo run --bin test-manager set debian11 qemu ./os-images/debian11.qcow2 linux \
     --package-type deb --architecture x64 \
-    --artifacts-dir /opt/testing \
-    --disks ./testrunner-images/linux-test-runner.img
+    --provisioner ssh --ssh-user test --ssh-password test
 
 # Try it out to see if it works
 cargo run --bin test-manager run-vm debian11

diff --git a/test/build.sh b/test/build.sh
@@ -22,7 +22,7 @@ else
     cargo build --bin test-runner --release --target "${TARGET}"
 fi
 
-# Don't build a runner image for macOS.
-if [[ $TARGET != aarch64-apple-darwin ]]; then
+# Only build runner image for Windows
+if [[ $TARGET == x86_64-pc-windows-gnu ]]; then
     ./scripts/build-runner-image.sh
 fi
diff --git a/test/scripts/build-runner-image.sh b/test/scripts/build-runner-image.sh
@@ -7,9 +7,6 @@ set -eu
 TEST_RUNNER_IMAGE_SIZE_MB=1000
 
 case $TARGET in
-    "x86_64-unknown-linux-gnu")
-        TEST_RUNNER_IMAGE_FILENAME=linux-test-runner.img
-        ;;
     "x86_64-pc-windows-gnu")
         TEST_RUNNER_IMAGE_FILENAME=windows-test-runner.img
         ;;
@@ -30,22 +27,6 @@ TEST_RUNNER_IMAGE_PATH="${SCRIPT_DIR}/../testrunner-images/${TEST_RUNNER_IMAGE_F
 
 case $TARGET in
 
-    "x86_64-unknown-linux-gnu")
-        truncate -s "${TEST_RUNNER_IMAGE_SIZE_MB}M" "${TEST_RUNNER_IMAGE_PATH}"
-        mkfs.ext4 -F "${TEST_RUNNER_IMAGE_PATH}"
-        e2cp \
-            -P 500 \
-            "${SCRIPT_DIR}/../target/$TARGET/release/test-runner" \
-            "${PACKAGES_DIR}/"app-e2e-* \
-            "${TEST_RUNNER_IMAGE_PATH}:/"
-        e2cp "${PACKAGES_DIR}/"*.deb \
-            "${TEST_RUNNER_IMAGE_PATH}:/" || true
-        e2cp "${PACKAGES_DIR}/"*.rpm \
-            "${TEST_RUNNER_IMAGE_PATH}:/" || true
-        e2cp "${SCRIPT_DIR}/../openvpn.ca.crt" \
-            "${TEST_RUNNER_IMAGE_PATH}:/"
-        ;;
-
     "x86_64-pc-windows-gnu")
         truncate -s "${TEST_RUNNER_IMAGE_SIZE_MB}M" "${TEST_RUNNER_IMAGE_PATH}"
         mformat -F -i "${TEST_RUNNER_IMAGE_PATH}" "::"