diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | README.org | 20 |
2 files changed, 21 insertions, 21 deletions
@@ -8,18 +8,18 @@ # make release - Full test + build + deploy # # Manual VM testing: -# make vm - Boot ISO in a single-disk VM -# make vm-multi - Boot ISO in a 2-disk VM (mirror/RAID) -# make vm-multi3 - Boot ISO in a 3-disk VM (raidz1) -# make vm-boot - Boot from installed disk (after install) -# make vm-clean - Remove VM disks and OVMF vars +# make test-vm - Boot ISO in a single-disk VM +# make test-multi - Boot ISO in a 2-disk VM (mirror/RAID) +# make test-multi3 - Boot ISO in a 3-disk VM (raidz1) +# make test-boot - Boot from installed disk (after install) +# make test-clean - Remove VM disks and OVMF vars # # make clean - Clean build artifacts # make distclean - Clean everything including releases # # Test configurations are in scripts/test-configs/ -.PHONY: test test-install build release clean distclean lint vm vm-multi vm-multi3 vm-boot vm-clean +.PHONY: test test-install test-vm test-multi test-multi3 test-boot test-clean build release clean distclean lint # Lint all bash scripts lint: @@ -54,23 +54,23 @@ release: test test-install # --- Manual VM testing --- # Boot ISO in a single-disk VM -vm: +test-vm: ./scripts/test-vm.sh # Boot ISO in a 2-disk VM (for mirror/RAID testing) -vm-multi: +test-multi: ./scripts/test-vm.sh --multi-disk # Boot ISO in a 3-disk VM (for raidz1 testing) -vm-multi3: +test-multi3: ./scripts/test-vm.sh --multi-disk=3 # Boot from installed disk (after running install in VM) -vm-boot: +test-boot: ./scripts/test-vm.sh --boot-disk # Remove VM disks and start fresh -vm-clean: +test-clean: ./scripts/test-vm.sh --clean # --- Cleanup --- @@ -44,11 +44,11 @@ Archangel currently uses linux-lts for stability. Choosing linux and linux-zen k make build # Launch a VM for interactive testing -make vm # single disk -make vm-multi # 2 disks (mirror/RAID) -make vm-multi3 # 3 disks (raidz1) -make vm-boot # boot from installed disk -make vm-clean # remove VM disks, start fresh +make test-vm # single disk +make test-multi # 2 disks (mirror/RAID) +make test-multi3 # 3 disks (raidz1) +make test-boot # boot from installed disk +make test-clean # remove VM disks, start fresh # Run automated install tests (all configs) make test-install @@ -150,7 +150,7 @@ modifying the installer or build scripts to catch regressions. ** Basic VM Test #+BEGIN_SRC bash -make vm +make test-vm #+END_SRC This creates a 50GB virtual disk and boots the ISO. @@ -159,10 +159,10 @@ This creates a 50GB virtual disk and boots the ISO. #+BEGIN_SRC bash # Two 50GB disks (for mirror) -make vm-multi +make test-multi # Three 50GB disks (for raidz1) -make vm-multi3 +make test-multi3 #+END_SRC ** SSH Access to VM @@ -180,13 +180,13 @@ sshpass -p archangel ssh -p 2222 root@localhost ** Clean VM State #+BEGIN_SRC bash -make vm-clean +make test-clean #+END_SRC ** Boot from Installed Disk #+BEGIN_SRC bash -make vm-boot +make test-boot #+END_SRC * Installation Walkthrough |