1
0
mirror of https://github.com/TheLocehiliosan/yadm synced 2026-03-02 03:49:29 +00:00

Update testbed docker image

This commit is contained in:
Tim Byrne
2020-07-08 00:58:54 -05:00
parent 51752233e9
commit 71ecf27291
4 changed files with 10 additions and 8 deletions

View File

@@ -1,4 +1,5 @@
PYTESTS = $(wildcard test/test_*.py)
IMAGE = yadm/testbed:2020-07-08
.PHONY: all
all:
@@ -90,7 +91,7 @@ $(PYTESTS):
test:
@if [ -f /.yadmtestbed ]; then \
cd /yadm && \
py.test -vv $(testargs); \
py.test -v $(testargs); \
else \
if command -v "docker-compose" &> /dev/null; then \
docker-compose run --rm testbed make test testargs="$(testargs)"; \
@@ -112,7 +113,7 @@ testhost: require-docker
--hostname testhost \
--rm -it \
-v "/tmp/testhost:/bin/yadm:ro" \
yadm/testbed:2020-01-20 \
$(IMAGE) \
bash -l
.PHONY: scripthost
@@ -129,7 +130,7 @@ scripthost: require-docker
--rm -it \
-v "$$PWD/script.gz:/script.gz:rw" \
-v "/tmp/testhost:/bin/yadm:ro" \
yadm/testbed:2020-01-20 \
$(IMAGE) \
bash -c "script /tmp/script -q -c 'bash -l'; gzip < /tmp/script > /script.gz"
@echo
@echo "Script saved to $$PWD/script.gz"