Switch to fedora-38 as AppVM template per 4.2RC1

deeplow · Jun 6, 2023 · 416543a · 416543a
1 parent b127b66
commit 416543a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git 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-37-dvm && qubes-prefs default_dispvm fedora-37-dvm || qubes-prefs default_dispvm ''
+    - name: qvm-check fedora-38-dvm && qubes-prefs default_dispvm fedora-38-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-37-dvm
+    - template: fedora-38-dvm
     - require:
       - cmd: restore-sys-usb-dispvm-halt-wait
       - cmd: set-fedora-as-default-dispvm
@@ -34,11 +34,11 @@ restore-sys-usb-dispvm-start:
     - require:
       - qvm: restore-sys-usb-dispvm
 
-# autoattach modifications are only present in sd-fedora-37-dvm
+# autoattach modifications are only present in sd-fedora-38-dvm
 # so no more sd-usb-autoattach-remove necessary
 remove-sd-fedora-dispvm:
   qvm.absent:
-    - name: sd-fedora-37-dvm
+    - name: sd-fedora-38-dvm
     - require:
       - qvm: restore-sys-usb-dispvm
 {% else %}

diff --git 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-37-dvm && qubes-prefs default_dispvm fedora-37-dvm || qubes-prefs default_dispvm ''
+    - name: qvm-check fedora-38-dvm && qubes-prefs default_dispvm fedora-38-dvm || qubes-prefs default_dispvm ''
diff --git 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-37' %}
+{% set sd_supported_fedora_version = 'fedora-38' %}
 
 
 # Install latest templates required for SDW VMs.

diff --git a/dom0/sd-usb-autoattach-add.sls b/dom0/sd-usb-autoattach-add.sls
@@ -6,7 +6,7 @@
 # USB devices to sd-devices.
 ##
 
-# If sys-usb is disposable, we have already set up sd-fedora-37-dvm to make our
+# If sys-usb is disposable, we have already set up sd-fedora-38-dvm to make our
 # modifications in, so we only want to modify sys-usb if it is a regular AppVM
 
 {% set apply = True %}

diff --git a/dom0/sd-workstation.top b/dom0/sd-workstation.top
@@ -40,7 +40,7 @@ base:
   securedrop-workstation-bullseye:
     - sd-workstation-template-files
     - sd-logging-setup
-  'sd-fedora-37-dvm,sys-usb':
+  'sd-fedora-38-dvm,sys-usb':
     - match: list
     - sd-usb-autoattach-add
   sd-log:

diff --git a/files/provision-all b/files/provision-all
@@ -31,8 +31,8 @@ echo "Provision all SecureDrop Workstation VMs with service-specific configs"
 sudo qubesctl --show-output --max-concurrency "$max_concurrency" --skip-dom0 --targets "$all_sdw_vms_target" state.highstate
 
 echo "Add SecureDrop export device handling to sys-usb"
-# If sd-fedora-37-dvm exists it's because salt determined that sys-usb was disposable
-qvm-check --quiet sd-fedora-37-dvm 2> /dev/null && \
-  sudo qubesctl --show-output --skip-dom0 --targets sd-fedora-37-dvm state.highstate && \
+# If sd-fedora-38-dvm exists it's because salt determined that sys-usb was disposable
+qvm-check --quiet sd-fedora-38-dvm 2> /dev/null && \
+  sudo qubesctl --show-output --skip-dom0 --targets sd-fedora-38-dvm state.highstate && \
   qvm-shutdown --wait sys-usb && qvm-start sys-usb || \
   sudo qubesctl --show-output --skip-dom0 --targets sys-usb state.highstate
diff --git 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 = "37"
+CURRENT_FEDORA_VERSION = "38"
 CURRENT_FEDORA_TEMPLATE = "fedora-" + CURRENT_FEDORA_VERSION
 CURRENT_WHONIX_VERSION = "16"
 

diff --git a/tests/test_qubes_vms.py b/tests/test_qubes_vms.py
@@ -30,7 +30,7 @@ def test_current_fedora_for_sys_vms(self):
             wanted_templates = [CURRENT_FEDORA_TEMPLATE]
             if sys_vm in sys_vms_maybe_disp:
                 if sys_vm in sys_vms_custom_disp:
-                    wanted_templates.append("sd-fedora-37-dvm")
+                    wanted_templates.append("sd-fedora-38-dvm")
                 else:
                     wanted_templates.append(CURRENT_FEDORA_TEMPLATE + "-dvm")