diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-06-25 14:56:10 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-06-25 14:56:10 +0200 |
| commit | d604ed8cc5a0eb0a5d26d28fdfba83c6cdcee672 (patch) | |
| tree | bf02cf18dfd21235095e9bb6e76d322434aa63e5 | |
| parent | 54c18a073eb36c86ef3e451d08559e894c96e3aa (diff) | |
| parent | cf46dcaeeb096963c4107c03e7a3d6bb9a4d6128 (diff) | |
| download | mullvadvpn-d604ed8cc5a0eb0a5d26d28fdfba83c6cdcee672.tar.xz mullvadvpn-d604ed8cc5a0eb0a5d26d28fdfba83c6cdcee672.zip | |
Merge branch 'add-fedora-40-as-a-test-runner-des-911'
| -rw-r--r-- | .github/workflows/desktop-e2e.yml | 6 | ||||
| -rw-r--r-- | test/README.md | 5 | ||||
| -rwxr-xr-x | test/container-run.sh | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml index eb3fcc061f..31b4436da0 100644 --- a/.github/workflows/desktop-e2e.yml +++ b/.github/workflows/desktop-e2e.yml @@ -15,8 +15,8 @@ on: oses: description: "Space-delimited list of targets to run tests on, e.g. `debian11 debian12`. \ Available images are:\n - `debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 ubuntu2310 ubuntu2404 fedora39 \ - fedora38 fedora37 fedora36 windows10 windows11 macos12 macos13 macos14`." + `debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 ubuntu2310 ubuntu2404 fedora40 \ + fedora39 fedora38 fedora37 fedora36 windows10 windows11 macos12 macos13 macos14`." default: '' required: false type: string @@ -29,7 +29,7 @@ jobs: run: | # A list of VMs to run the tests on. These refer to the names defined # in $XDG_CONFIG_DIR/mullvad-test/config.json on the runner. - all='["debian11","debian12","ubuntu2004","ubuntu2204","ubuntu2304","ubuntu2310","ubuntu2404","fedora39","fedora38","fedora37","fedora36"]' + all='["debian11","debian12","ubuntu2004","ubuntu2204","ubuntu2304","ubuntu2310","ubuntu2404","fedora40","fedora39","fedora38","fedora37","fedora36"]' oses="${{ github.event.inputs.oses }}" echo "OSES: $oses" if [[ -z "$oses" || "$oses" == "null" ]]; then diff --git a/test/README.md b/test/README.md index 7bbdbd901e..07f223dac3 100644 --- a/test/README.md +++ b/test/README.md @@ -63,8 +63,7 @@ dnf install git gcc protobuf-devel libpcap-devel qemu \ Building the `test-runner` binary is done with the `build-runner.sh` script. Currently, only `x86_64` platforms are supported for Windows/Linux and `ARM64` (Apple Silicon) for macOS. -The `build-runner.sh` requires the `$TARGET` environment variable to be set. -For example, building `test-runner` for Linux would look like this: +For example, building `test-runner` for Windows would look like this: ``` bash ./container-run.sh ./build-runner.sh windows @@ -109,7 +108,7 @@ cargo run --bin test-manager set debian11 qemu ./os-images/debian11.qcow2 linux --package-type deb --architecture x64 \ --provisioner ssh --ssh-user test --ssh-password test -# Try it out to see if it works +# Try it out to see if it works - you should reach the VM's graphical desktop environment cargo run --bin test-manager run-vm debian11 # Run all tests diff --git a/test/container-run.sh b/test/container-run.sh index 58425b2a4d..e4f24a29d9 100755 --- a/test/container-run.sh +++ b/test/container-run.sh @@ -6,6 +6,10 @@ CARGO_REGISTRY_VOLUME_NAME=${CARGO_REGISTRY_VOLUME_NAME:-"cargo-registry"} CONTAINER_RUNNER=${CONTAINER_RUNNER:-"podman"} PACKAGES_DIR=${PACKAGES_DIR:-"$HOME/.cache/mullvad-test/packages"} +if [ ! -d "$PACKAGES_DIR" ]; then + echo "$PACKAGES_DIR does not exist. It is needed to build the test bundle, so please go ahead and create the directory and re-run this script." +fi + SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" REPO_DIR="$SCRIPT_DIR/.." cd "$SCRIPT_DIR" |