From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 65BA6914BD for ; Tue, 3 Oct 2023 12:21:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 48DA21FE0D for ; Tue, 3 Oct 2023 12:21:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 3 Oct 2023 12:21:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EDAD144236 for ; Tue, 3 Oct 2023 12:21:50 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 3 Oct 2023 12:21:46 +0200 Message-ID: <20231003102147.685374-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.037 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 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] [PATCH installer] low level: testmode: take path to disk image instead of using /dev/null 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: , X-List-Received-Date: Tue, 03 Oct 2023 10:21:53 -0000 .. in exactly the same way `proxinstall` does, streamlining them both. Up until now, testing the TUI installer often involved hand-editing the `run-env-info.json` to put some proper disk sizes > 0 in place. This makes this process just a lot easier. Signed-off-by: Christoph Heiss --- Makefile | 15 ++++++++++----- proxmox-low-level-installer | 8 ++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index dc180b2..2875d2a 100644 --- a/Makefile +++ b/Makefile @@ -135,26 +135,31 @@ cd-info.test: check-pve: prepare-check-env test.img rm -f cd-info.test; $(MAKE) cd-info.test - ./proxmox-low-level-installer dump-env -t + ./proxmox-low-level-installer dump-env -t test.img G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img check-pve-multidisks: prepare-check-env test.img test2.img test3.img test4.img test5.big.img rm -f cd-info.test; $(MAKE) cd-info.test - ./proxmox-low-level-installer dump-env -t + ./proxmox-low-level-installer dump-env -t test.img,test2.img,test3.img,test4.img,test5.big.img G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img,test2.img,test3.img,test4.img,test5.big.img check-pve-tui: prepare-check-env test.img rm -f cd-info.test; $(MAKE) cd-info.test - ./proxmox-low-level-installer dump-env -t + ./proxmox-low-level-installer dump-env -t test.img testdir/usr/bin/proxmox-tui-installer -t test.img +check-pve-tui-multidisks: prepare-check-env test.img test2.img test3.img test4.img test5.big.img + rm -f cd-info.test; $(MAKE) cd-info.test + ./proxmox-low-level-installer dump-env -t test.img,test2.img,test3.img,test4.img,test5.big.img + testdir/usr/bin/proxmox-tui-installer -t test.img,test2.img,test3.img,test4.img,test5.big.img + prepare-check-pmg: prepare-check-env test.img rm -f cd-info.test; $(MAKE) \ PRODUCT=pmg \ PRODUCTLONG="Proxmox Mail Gateway" \ ISONAME='proxmox-mail-gateway' \ cd-info.test - ./proxmox-low-level-installer dump-env -t + ./proxmox-low-level-installer dump-env -t test.img check-pmg: prepare-check-pmg G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img @@ -168,7 +173,7 @@ prepare-check-pbs: prepare-check-env test.img PRODUCTLONG='Proxmox Backup Server' \ ISONAME='proxmox-backup-server' \ cd-info.test - ./proxmox-low-level-installer dump-env -t + ./proxmox-low-level-installer dump-env -t test.img check-pbs: prepare-check-pbs G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img diff --git a/proxmox-low-level-installer b/proxmox-low-level-installer index 814961e..0f2bf4f 100755 --- a/proxmox-low-level-installer +++ b/proxmox-low-level-installer @@ -11,14 +11,14 @@ use JSON; use Time::HiRes qw(usleep); { - my $test_mode; + my $test_image; GetOptions( - 'test-mode|t' => \$test_mode + 'test-image|t=s' => \$test_image ) or die "usage error\n"; - # FIXME: use cleaner approach for setting tet mode? - Proxmox::Install::ISOEnv::set_test_image('/dev/null') if $test_mode; + Proxmox::Install::ISOEnv::set_test_image($test_image) if $test_image; } + use Proxmox::Install::ISOEnv; use Proxmox::Install::RunEnv; -- 2.41.0