diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-10-01 10:12:06 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-10-01 10:12:06 +0200 |
| commit | 1102f5c4ad865045afc843289094f0617b43cd9b (patch) | |
| tree | adac41fad1d29fe0b3384b12ffc8d41c53f87567 | |
| parent | d4438db88df86f5c45ddfc37d84b8962f24719db (diff) | |
| parent | 337fc509ee628dc4bcefc2529454734dc3938de3 (diff) | |
| download | mullvadvpn-1102f5c4ad865045afc843289094f0617b43cd9b.tar.xz mullvadvpn-1102f5c4ad865045afc843289094f0617b43cd9b.zip | |
Merge branch 'add-ubuntu2510'
| -rw-r--r-- | .github/workflows/desktop-e2e.yml | 9 | ||||
| -rw-r--r-- | test/scripts/ssh-setup.sh | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml index 766cab60d7..ea332840d0 100644 --- a/.github/workflows/desktop-e2e.yml +++ b/.github/workflows/desktop-e2e.yml @@ -15,12 +15,13 @@ on: oses: description: "Space-delimited list of targets to run tests on, e.g. `debian13 ubuntu2404`. \ Available images:\n - `debian11 debian12 debian13 ubuntu2204 ubuntu2404 ubuntu2504 \ + `debian11 debian12 debian13 \ + ubuntu2204 ubuntu2404 ubuntu2504 ubuntu2510 \ fedora41 fedora42 fedora43 \ windows10 windows11 \ macos12 macos13 macos14 macos15 macos26`.\n Default images:\n - `debian13 ubuntu2204 ubuntu2404 ubuntu2504 \ + `debian13 ubuntu2204 ubuntu2404 ubuntu2504 ubuntu2510 \ fedora41 fedora42 fedora43 windows10 windows11 \ macos13 macos14 macos15 macos26`." default: '' @@ -44,8 +45,8 @@ 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","debian13","ubuntu2204","ubuntu2404","ubuntu2504","fedora41","fedora42","fedora43"]' - default='["debian13","ubuntu2204","ubuntu2404","ubuntu2504","fedora41","fedora42","fedora43"]' + all='["debian11","debian12","debian13","ubuntu2204","ubuntu2404","ubuntu2504","ubuntu2510","fedora41","fedora42","fedora43"]' + default='["debian13","ubuntu2204","ubuntu2404","ubuntu2504","ubuntu2510","fedora41","fedora42","fedora43"]' oses="${{ github.event.inputs.oses }}" echo "OSES: $oses" if [[ -z "$oses" || "$oses" == "null" ]]; then diff --git a/test/scripts/ssh-setup.sh b/test/scripts/ssh-setup.sh index 66809407d8..2d4711f080 100644 --- a/test/scripts/ssh-setup.sh +++ b/test/scripts/ssh-setup.sh @@ -140,12 +140,16 @@ function install_packages_apt { if ! which ping &>/dev/null; then robust_apt install iputils-ping fi +} + +function install_docker { curl -fsSL https://get.docker.com | sh } # Install required packages if which apt &>/dev/null; then install_packages_apt + install_docker || echo "Failed to install docker" # Be a bit lenient on this - If it fails to install, the container tests will simply fail. elif which dnf &>/dev/null; then dnf install -y xorg-x11-server-Xvfb wireguard-tools podman fi |