From 63fd75c3ed9581cc3149b25a8ac9f78d7064fe0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 23 Apr 2026 16:48:41 +0200 Subject: [PATCH] tests: use dom0's version for installing templates via mgmtvm Pass --relasever explicitly, so the test installs correct template regardless of which version of template is used. This is especially useful in the transitive period before templates for the upcoming release are pushed. --- qubes/tests/integ/dom0_update.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/qubes/tests/integ/dom0_update.py b/qubes/tests/integ/dom0_update.py index 0eb50ffe1..bf6e52a85 100644 --- a/qubes/tests/integ/dom0_update.py +++ b/qubes/tests/integ/dom0_update.py @@ -32,6 +32,25 @@ VM_PREFIX = "test-" +try: + dom0_releasever = ( + subprocess.check_output( + [ + "rpm", + "-q", + "--whatprovides", + "--qf", + "%{VERSION}", + "system-release", + ], + stderr=subprocess.DEVNULL, + ) + .decode() + .strip() + ) +except subprocess.CalledProcessError: + dom0_releasever = "4.3" + @unittest.skipUnless( os.path.exists("/usr/bin/rpmsign") and os.path.exists("/usr/bin/rpmbuild"), @@ -694,7 +713,10 @@ def test_010_template_install(self): class TC_11_QvmTemplateMgmtVMMixin(TC_10_QvmTemplateMixin): - common_args = TC_10_QvmTemplateMixin.common_args + ["--updatevm="] + common_args = TC_10_QvmTemplateMixin.common_args + [ + "--updatevm=", + f"--releasever={dom0_releasever}", + ] def run_qvm_template(self, *args): try: