diff options
| author | Devaev Maxim <[email protected]> | 2019-10-08 03:20:59 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2019-10-08 10:43:11 +0300 |
| commit | bc3a15aba3c3a8ffb58e076af1bff9ff850e5296 (patch) | |
| tree | f14be78bc55eb329dd2439e1dd10770089276b9a /Makefile | |
| parent | 149c0611f8d8a41f1e4fae04c3f6dc3dbb43cc29 (diff) | |
testenv: using override instead complete config
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -54,7 +54,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 /src/testenv/main.yaml /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 \ && cd /src \ && tox -c testenv/tox.ini $(if $(E),-e $(E),-p auto) \ " @@ -77,7 +78,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 /testenv/main.yaml /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 \ && 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) \ @@ -92,12 +94,14 @@ run-ipmi: testenv --volume `pwd`/testenv/run:/run/kvmd:rw \ --volume `pwd`/testenv:/testenv:ro \ --volume `pwd`/kvmd:/kvmd:ro \ + --volume `pwd`/extras:/usr/share/kvmd/extras:ro \ --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ --publish 6230:623/udp \ -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 /testenv/main.yaml /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 \ && $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi) \ " |