diff options
| author | Devaev Maxim <[email protected]> | 2019-11-10 01:08:02 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2019-11-10 01:09:33 +0300 |
| commit | b7d4c7abe6c4aa37a925ee7bd9dd3fc9b40aae8d (patch) | |
| tree | a265d127d1aff28fcb3aa83abb6a08ae2dde0dc1 | |
| parent | 94d5eb9451bd32dc2239647baee3bfa36c4265d8 (diff) | |
default test platform = v2-hdmi-rpi4
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | testenv/v1-vga-rpi3.override.yaml (renamed from testenv/v1-vga.override.yaml) | 0 | ||||
| -rw-r--r-- | testenv/v2-hdmi-rpi4.override.yaml (renamed from testenv/v2-hdmi.override.yaml) | 0 |
3 files changed, 3 insertions, 3 deletions
@@ -7,7 +7,7 @@ TESTENV_LOOP ?= /dev/loop7 USTREAMER_MIN_VERSION ?= $(shell grep -o 'ustreamer>=[^"]\+' PKGBUILD | sed 's/ustreamer>=//g') -DEFAULT_PLATFORM ?= v1-vga +DEFAULT_PLATFORM ?= v2-hdmi-rpi4 # ===== @@ -56,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/$(if $(P),$(P),v1-vga).yaml /etc/kvmd/main.yaml \ - && cp /src/testenv/$(if $(P),$(P),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 /src/testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cd /src \ && tox -q -c testenv/tox.ini $(if $(E),-e $(E),-p auto) \ " diff --git a/testenv/v1-vga.override.yaml b/testenv/v1-vga-rpi3.override.yaml index d1eee78b..d1eee78b 100644 --- a/testenv/v1-vga.override.yaml +++ b/testenv/v1-vga-rpi3.override.yaml diff --git a/testenv/v2-hdmi.override.yaml b/testenv/v2-hdmi-rpi4.override.yaml index a205d666..a205d666 100644 --- a/testenv/v2-hdmi.override.yaml +++ b/testenv/v2-hdmi-rpi4.override.yaml |