diff options
| author | Devaev Maxim <[email protected]> | 2019-11-07 06:42:48 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2019-11-07 06:42:48 +0300 |
| commit | 8abe4b1ac9d341eec17d211328b9f3cd9b59fa0a (patch) | |
| tree | 87d08459405e48edd91c09662d440edc378de9a2 /Makefile | |
| parent | 10f8c2b3352c951549cc1249d6b24789fb94d688 (diff) | |
v2 testing
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -7,6 +7,8 @@ TESTENV_LOOP ?= /dev/loop7 USTREAMER_MIN_VERSION ?= $(shell grep -o 'ustreamer>=[^"]\+' PKGBUILD | sed 's/ustreamer>=//g') +DEFAULT_PLATFORM ?= v1-vga + # ===== define optbool @@ -54,8 +56,8 @@ tox: testenv -it $(TESTENV_IMAGE) bash -c " \ cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ - && cp /usr/share/kvmd/configs.default/kvmd/main/v1-vga.yaml /etc/kvmd/main.yaml \ - && cp /src/testenv/v1-vga.override.yaml /etc/kvmd/override.yaml \ + && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),v1-vga).yaml /etc/kvmd/main.yaml \ + && cp /src/testenv/$(if $(P),$(P),v1-vga).override.yaml /etc/kvmd/override.yaml \ && cd /src \ && tox -q -c testenv/tox.ini $(if $(E),-e $(E),-p auto) \ " @@ -78,8 +80,8 @@ run: testenv && cp -r /usr/share/kvmd/configs.default/nginx/* /etc/kvmd/nginx \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ - && cp /usr/share/kvmd/configs.default/kvmd/main/v1-vga.yaml /etc/kvmd/main.yaml \ - && cp /testenv/v1-vga.override.yaml /etc/kvmd/override.yaml \ + && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ + && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && nginx -c /etc/kvmd/nginx/nginx.conf -g 'user http; error_log stderr;' \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-video \ && (losetup -d /dev/kvmd-msd || true) \ @@ -100,8 +102,8 @@ run-ipmi: testenv -it $(TESTENV_IMAGE) /bin/bash -c " \ cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ - && cp /usr/share/kvmd/configs.default/kvmd/main/v1-vga.yaml /etc/kvmd/main.yaml \ - && cp /testenv/v1-vga.override.yaml /etc/kvmd/override.yaml \ + && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ + && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi) \ " |