[pve-devel] [PATCH installer v2] low level: testmode: take path to disk image instead of using /dev/null
Christoph Heiss
c.heiss at proxmox.com
Thu Nov 9 10:47:56 CET 2023
.. in exactly the same way GUI and TUI installer do, streamlining them.
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 a lot easier.
Signed-off-by: Christoph Heiss <c.heiss at proxmox.com>
---
v1: https://lists.proxmox.com/pipermail/pve-devel/2023-October/059311.html
Changes v1 -> v2:
* rebased on latest master
Makefile | 15 ++++++++++-----
proxmox-low-level-installer | 8 ++++----
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 5e94c29..6f64c4e 100644
--- a/Makefile
+++ b/Makefile
@@ -139,26 +139,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 2>testdir/run/stderr
+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
@@ -172,7 +177,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.42.0
More information about the pve-devel
mailing list