From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D05031FF16B for ; Thu, 6 Mar 2025 11:45:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D679A3EA; Thu, 6 Mar 2025 11:45:03 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Mar 2025 11:44:52 +0100 Message-Id: <20250306104459.1272297-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250306104459.1272297-1-d.csapak@proxmox.com> References: <20250306104459.1272297-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC PATCH qemu-server 1/8] tests: cfg2cmd: pin QEMU version X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" but warn when we're out of date compared to the installed one, and die when we're one major (+1 minor) release behind. (the warning is not very visible when running tests or when building) We don't want to depend on the installed QEMU version for such tests, otherwise a developer might need to adapt tests because the installed QEMU version is different to what is e.g. in the build environment for our packaging. Also, this way, we have to show intent for bumping this and it will be obvious that we need to adapt tests because of a changed QEMU version. Signed-off-by: Dominik Csapak --- test/run_config2command_tests.pl | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/test/run_config2command_tests.pl b/test/run_config2command_tests.pl index 7e3d10e6..5fa6f2de 100755 --- a/test/run_config2command_tests.pl +++ b/test/run_config2command_tests.pl @@ -20,6 +20,10 @@ use PVE::QemuServer::Monitor; use PVE::QemuServer::QMPHelpers; use PVE::QemuServer::CPUConfig; +# bump when QEMU version changes +my $tested_version_major = 9; +my $tested_version_minor = 2; + my $base_env = { storage_config => { ids => { @@ -80,6 +84,7 @@ my $base_env = { } }, vmid => 8006, + tested_qemu_version => "$tested_version_major.$tested_version_minor", real_qemu_version => PVE::QemuServer::Helpers::kvm_user_version(), # not yet mocked }; @@ -184,7 +189,7 @@ sub parse_test($) { } sub get_test_qemu_version { - $current_test->{qemu_version} // $base_env->{real_qemu_version} // '2.12'; + $current_test->{qemu_version} // $base_env->{tested_qemu_version} // '2.12'; } my $qemu_server_module; @@ -528,3 +533,19 @@ if (my $file = shift) { } done_testing(); + +# reset warn +$SIG{__WARN__} = undef; +if ($base_env->{real_qemu_version} =~ m/^(\d+.\d+)/) { + if (PVE::QemuServer::Helpers::version_cmp($1, $tested_version_major, $2, $tested_version_minor) < 0) { + warn "\nWARNING: installed QEMU version bigger than tested one, please bump!\n"; + } + + # if we did not bump since the last major QEMU (+1 minor) release fail the test + if (PVE::QemuServer::Helpers::version_cmp($1, $tested_version_major + 1, $2, 1) >= 0) { + die "\nERROR: installed QEMU version one major release bigger than tested one, please bump!\n"; + } + +} else { + die "\nERROR: invalid QEMU version\n"; +} -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel