From f7c52891958f02a4bee3145edab04c103524a9bd Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 3 Oct 2018 11:10:45 -0400 Subject: [PATCH] Clean up CI compose test invocation --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e3d98840b9..1917cb05a5 100644 --- a/Makefile +++ b/Makefile @@ -565,7 +565,8 @@ docker-compose-test: docker-auth cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /bin/bash docker-compose-runtest: - cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /start_tests.sh && docker-compose rm -sf + TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) tools/docker-compose run --rm --service-ports awx /start_tests.sh + TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose rm -sf docker-compose-build: awx-devel-build