Skip to content

Commit

Permalink
Converts fedora-31 VMs to fedora-32 throughout (#642)
Browse files Browse the repository at this point in the history
* Updates fedora-31 -> fedora-32 throughout

Updates all references fedora-31 -> fedora-32, both in documentation and
in the actual state files that configure dependencies.

* Bumps version to 0.5.1-rc1
  • Loading branch information
conorsch committed Nov 17, 2020
1 parent f08b226 commit 0aee0e0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.0
0.5.1-rc1
2 changes: 1 addition & 1 deletion launcher/sdw_updater_gui/Updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# as well as their associated TemplateVMs.
# In the future, we could use qvm-prefs to extract this information.
current_vms = {
"fedora": "fedora-31",
"fedora": "fedora-32",
"sd-viewer": "sd-large-buster-template",
"sd-app": "sd-small-buster-template",
"sd-log": "sd-small-buster-template",
Expand Down
4 changes: 2 additions & 2 deletions launcher/tests/test_updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ def test_shutdown_and_start_vms(
call("sys-usb"),
]
template_vm_calls = [
call("fedora-31"),
call("fedora-32"),
call("sd-large-buster-template"),
call("sd-small-buster-template"),
call("whonix-gw-15"),
Expand Down Expand Up @@ -548,7 +548,7 @@ def test_shutdown_and_start_vms_sysvm_fail(
call("sd-log"),
]
template_vm_calls = [
call("fedora-31"),
call("fedora-32"),
call("sd-large-buster-template"),
call("sd-small-buster-template"),
call("whonix-gw-15"),
Expand Down
11 changes: 7 additions & 4 deletions rpm-build/SPECS/securedrop-workstation-dom0-config.spec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name: securedrop-workstation-dom0-config
Version: 0.5.0
Release: 1%{?dist}
Version: 0.5.1
Release: 0.rc1.1%{?dist}
Summary: SecureDrop Workstation

Group: Library
License: GPLv3+
URL: https://github.com/freedomofpress/securedrop-workstation
Source0: securedrop-workstation-dom0-config-0.5.0.tar.gz
Source0: securedrop-workstation-dom0-config-0.5.1rc1.tar.gz

BuildArch: noarch
BuildRequires: python3-setuptools
Expand All @@ -28,7 +28,7 @@ configuration over time.
%undefine py_auto_byte_compile

%prep
%setup -n securedrop-workstation-dom0-config-0.5.0
%setup -n securedrop-workstation-dom0-config-0.5.1rc1

%build
%{__python3} setup.py build
Expand Down Expand Up @@ -107,6 +107,9 @@ find /srv/salt -maxdepth 1 -type f -iname '*.top' \
| xargs qubesctl top.enable > /dev/null

%changelog
* Tue Nov 17 2020 SecureDrop Team <securedrop@freedom.press> - 0.5.1-rc1
- Migrates Fedora 31 templates to Fedora 32

* Mon Nov 09 2020 SecureDrop Team <securedrop@freedom.press> - 0.5.0
- Consolidates templates into small and large
- Modifies updater UI to rerun full state if required
Expand Down

0 comments on commit 0aee0e0

Please sign in to comment.