From 6ba7700fa7f77da0ff0acbefaa9385aaf4cd1845 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Mon, 5 Dec 2016 17:06:04 +0100 Subject: [PATCH] Add project prefix for composer environment (#3116) This prefix is need to run tests with different environments in parallel so one does not affect the other. Like this 2x and snapshot builds should be able to coexist --- libbeat/scripts/Makefile | 2 +- testing/environments/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile index 52e942cce0de..137dded6b209 100755 --- a/libbeat/scripts/Makefile +++ b/libbeat/scripts/Makefile @@ -43,7 +43,7 @@ TEST_ENVIRONMENT?=false SYSTEM_TESTS?=false GOX_OS?=linux darwin windows solaris freebsd netbsd openbsd TESTING_ENVIRONMENT?=snapshot -DOCKER_COMPOSE?=docker-compose -f ${PWD}/../testing/environments/base.yml -f ${PWD}/../testing/environments/${TESTING_ENVIRONMENT}.yml -f docker-compose.yml +DOCKER_COMPOSE?=docker-compose -p ${TESTING_ENVIRONMENT} -f ${PWD}/../testing/environments/base.yml -f ${PWD}/../testing/environments/${TESTING_ENVIRONMENT}.yml -f docker-compose.yml DOCKER_CACHE?=1 # If set to 0, all docker images are created without cache GOPACKAGES_COMMA_SEP=$(subst $(space),$(comma),$(strip ${GOPACKAGES})) PYTHON_ENV?=${BUILD_DIR}/python-env diff --git a/testing/environments/Makefile b/testing/environments/Makefile index 406b3571972b..8a6bad667d78 100644 --- a/testing/environments/Makefile +++ b/testing/environments/Makefile @@ -8,7 +8,7 @@ start: stop: ${BASE_COMMAND} stop - ${BASE_COMMAND} rm -f + ${BASE_COMMAND} rm up: