From fef991d0eb8f3093a94ccf37a4bf996e4a2a46c2 Mon Sep 17 00:00:00 2001 From: Michael Z Date: Fri, 1 Jul 2022 16:46:44 -0400 Subject: [PATCH] Update to support/migrate to Fedora 36 templates --- README.md | 2 +- dom0/sd-clean-all.sls | 4 ++-- dom0/sd-clean-default-dispvm.sls | 2 +- dom0/sd-sys-vms.sls | 2 +- launcher/sdw_updater_gui/Updater.py | 2 +- launcher/tests/test_updater.py | 4 ++-- tests/base.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 14eac210..5e649cd2 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ When developing on the Workstation, make sure to edit files in `sd-dev`, then co The staging environment differs from a production envionment in that it builds a local RPM, installs it in dom0, uses the dom0 package repository configuration for future updates of the RPM package from the https://yum-test.securedrop.org repository, and makes it so that you receive the latest nightlies of the workstation components, such as the SecureDrop Client. -#### Update `dom0`, `fedora-35`, `whonix-gw-16` and `whonix-ws-16` templates +#### Update `dom0`, `fedora-36`, `whonix-gw-16` and `whonix-ws-16` templates Updates to these VMs will be provided by the installer and updater, but to ensure they are up to date prior to install, it will be easier to debug, should something go wrong. diff --git a/dom0/sd-clean-all.sls b/dom0/sd-clean-all.sls index 9d98e019..ed7e06d6 100644 --- a/dom0/sd-clean-all.sls +++ b/dom0/sd-clean-all.sls @@ -5,7 +5,7 @@ set-fedora-as-default-dispvm: cmd.run: - - name: qvm-check fedora-35-dvm && qubes-prefs default_dispvm fedora-35-dvm || qubes-prefs default_dispvm '' + - name: qvm-check fedora-36-dvm && qubes-prefs default_dispvm fedora-36-dvm || qubes-prefs default_dispvm '' {% set gui_user = salt['cmd.shell']('groupmems -l -g qubes') %} @@ -23,7 +23,7 @@ restore-sys-usb-dispvm-halt-wait: restore-sys-usb-dispvm: qvm.prefs: - name: sys-usb - - template: fedora-35-dvm + - template: fedora-36-dvm - require: - cmd: restore-sys-usb-dispvm-halt-wait - cmd: set-fedora-as-default-dispvm diff --git a/dom0/sd-clean-default-dispvm.sls b/dom0/sd-clean-default-dispvm.sls index 7787e551..27604026 100644 --- a/dom0/sd-clean-default-dispvm.sls +++ b/dom0/sd-clean-default-dispvm.sls @@ -3,4 +3,4 @@ set-fedora-as-default-dispvm: cmd.run: - - name: qvm-check fedora-35-dvm && qubes-prefs default_dispvm fedora-35-dvm || qubes-prefs default_dispvm '' + - name: qvm-check fedora-36-dvm && qubes-prefs default_dispvm fedora-36-dvm || qubes-prefs default_dispvm '' diff --git a/dom0/sd-sys-vms.sls b/dom0/sd-sys-vms.sls index 49d3639f..3d90cfa3 100644 --- a/dom0/sd-sys-vms.sls +++ b/dom0/sd-sys-vms.sls @@ -9,7 +9,7 @@ include: # DispVM is created - qvm.default-dispvm -{% set sd_supported_fedora_version = 'fedora-35' %} +{% set sd_supported_fedora_version = 'fedora-36' %} # Install latest templates required for SDW VMs. diff --git a/launcher/sdw_updater_gui/Updater.py b/launcher/sdw_updater_gui/Updater.py index 5f8cca5e..5e1607de 100644 --- a/launcher/sdw_updater_gui/Updater.py +++ b/launcher/sdw_updater_gui/Updater.py @@ -40,7 +40,7 @@ # as well as their associated TemplateVMs. # In the future, we could use qvm-prefs to extract this information. current_vms = { - "fedora": "fedora-35", + "fedora": "fedora-36", "sd-viewer": "sd-large-{}-template".format(DEBIAN_VERSION), "sd-app": "sd-small-{}-template".format(DEBIAN_VERSION), "sd-log": "sd-small-{}-template".format(DEBIAN_VERSION), diff --git a/launcher/tests/test_updater.py b/launcher/tests/test_updater.py index 7d5c5a9d..8ff57f2e 100644 --- a/launcher/tests/test_updater.py +++ b/launcher/tests/test_updater.py @@ -492,7 +492,7 @@ def test_shutdown_and_start_vms( call("sys-usb"), ] template_vm_calls = [ - call("fedora-35"), + call("fedora-36"), call("sd-large-{}-template".format(DEBIAN_VERSION)), call("sd-small-{}-template".format(DEBIAN_VERSION)), call("whonix-gw-16"), @@ -538,7 +538,7 @@ def test_shutdown_and_start_vms_sysvm_fail( call("sd-log"), ] template_vm_calls = [ - call("fedora-35"), + call("fedora-36"), call("sd-large-{}-template".format(DEBIAN_VERSION)), call("sd-small-{}-template".format(DEBIAN_VERSION)), call("whonix-gw-16"), diff --git a/tests/base.py b/tests/base.py index edeb356a..bf9b6384 100644 --- a/tests/base.py +++ b/tests/base.py @@ -7,7 +7,7 @@ # Reusable constant for DRY import across tests WANTED_VMS = ["sd-gpg", "sd-log", "sd-proxy", "sd-app", "sd-viewer", "sd-whonix", "sd-devices"] -CURRENT_FEDORA_VERSION = "35" +CURRENT_FEDORA_VERSION = "36" CURRENT_FEDORA_TEMPLATE = "fedora-" + CURRENT_FEDORA_VERSION CURRENT_WHONIX_VERSION = "16"