diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-12-09 22:40:58 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-12-09 22:40:58 +0100 |
| commit | ee4d89a381e6fe3c807d24b35ef870b500edc676 (patch) | |
| tree | 988f92b1a0f6bd7bd42bc163359dfc82c4da1c23 /Makefile | |
| parent | 205ffd67a762c4b204b8a3496862019444edf9c0 (diff) | |
| parent | 4a21175243e0dc86b710cf4754834241d0cfcfd9 (diff) | |
| download | vyos-build-ee4d89a381e6fe3c807d24b35ef870b500edc676.tar.gz vyos-build-ee4d89a381e6fe3c807d24b35ef870b500edc676.zip | |
Merge branch 'raid1-test' into current
* raid1-test:
Jenkins: run "make testraid" for RAID-1 verification
Testsuite: set default timeout to 60 seconds
Testsuite: add new "make testraid" target for RAID-1 installation testing
Testsuite: reference default user/pass from variable
Makefile: add common helper to check if ISO was build before running tests
Kernel: T3318: update Linux Kernel to v5.10.84
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 31 |
1 files changed, 14 insertions, 17 deletions
@@ -88,42 +88,39 @@ vep1400: check_build_config clean prepare cd .. @scripts/copy-image -.PHONY: test +.PHONY: checkiso .ONESHELL: -test: +checkiso: if [ ! -f build/live-image-amd64.hybrid.iso ]; then echo "Could not find build/live-image-amd64.hybrid.iso" exit 1 fi + +.PHONY: test +.ONESHELL: +test: checkiso scripts/check-qemu-install --debug --uefi build/live-image-amd64.hybrid.iso .PHONY: test-no-interfaces .ONESHELL: -test-no-interfaces: - if [ ! -f build/live-image-amd64.hybrid.iso ]; then - echo "Could not find build/live-image-amd64.hybrid.iso" - exit 1 - fi +test-no-interfaces: checkiso scripts/check-qemu-install --debug --no-interfaces build/live-image-amd64.hybrid.iso .PHONY: testd .ONESHELL: -testd: - if [ ! -f build/live-image-amd64.hybrid.iso ]; then - echo "Could not find build/live-image-amd64.hybrid.iso" - exit 1 - fi +testd: checkiso scripts/check-qemu-install --debug --configd build/live-image-amd64.hybrid.iso .PHONY: testc .ONESHELL: -testc: - if [ ! -f build/live-image-amd64.hybrid.iso ]; then - echo "Could not find build/live-image-amd64.hybrid.iso" - exit 1 - fi +testc: checkiso scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso +.PHONY: testraid +.ONESHELL: +testraid: checkiso + scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso + .PHONY: clean .ONESHELL: clean: |