summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-09-26 09:29:51 +0200
committerDavid Lönnhager <david.l@mullvad.net>2024-09-26 09:29:51 +0200
commitc15e49ec816a6775d77c3c4e74938c52b3270fcb (patch)
treef549a1ff049777ea814f59e14ee8a719f89f6f22
parent8de2c04342520dbedad63c83752a9d355bd60165 (diff)
parent1f0a2ffd669ef75560524d1f9d04127202350686 (diff)
downloadmullvadvpn-c15e49ec816a6775d77c3c4e74938c52b3270fcb.tar.xz
mullvadvpn-c15e49ec816a6775d77c3c4e74938c52b3270fcb.zip
Merge branch 'add-fedora-41'
-rw-r--r--.github/workflows/desktop-e2e.yml6
-rw-r--r--test/docs/BUILD_OS_IMAGE.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml
index 04bd820a3d..d386078d4e 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 ubuntu2404 ubuntu2410 fedora40 \
- fedora39 windows10 windows11 macos12 macos13 macos14 macos15`."
+ `debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2404 ubuntu2410 fedora39 \
+ fedora40 fedora41 windows10 windows11 macos12 macos13 macos14 macos15`."
default: ''
required: false
type: string
@@ -38,7 +38,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","ubuntu2404","ubuntu2410","fedora40","fedora39"]'
+ all='["debian11","debian12","ubuntu2004","ubuntu2204","ubuntu2404","ubuntu2410","fedora39","fedora40","fedora41"]'
oses="${{ github.event.inputs.oses }}"
echo "OSES: $oses"
if [[ -z "$oses" || "$oses" == "null" ]]; then
diff --git a/test/docs/BUILD_OS_IMAGE.md b/test/docs/BUILD_OS_IMAGE.md
index 29acebb370..87e2c88e58 100644
--- a/test/docs/BUILD_OS_IMAGE.md
+++ b/test/docs/BUILD_OS_IMAGE.md
@@ -18,7 +18,7 @@ On the host, start by creating a disk image and installing Debian on it:
```
wget -O debian.iso https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-11.5.0-amd64-netinst.iso
qemu-img create -f qcow2 ./debian.qcow2 5G
-qemu-system-x86_64 -cpu host -accel kvm -m 4096 -smp 2 -cdrom debian.iso -drive file=./debian.qcow2
+qemu-system-x86_64 -cpu host -accel kvm -m 8192 -smp 8 -cdrom debian.iso -drive file=./debian.qcow2
```
## Installing Linux