Add project prefix for composer environment (elastic#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
tsg · Dec 5, 2016 · 6ba7700 · 6ba7700
1 parent 85cfa08
commit 6ba7700
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -8,7 +8,7 @@ start:
 
 stop:
 	${BASE_COMMAND} stop
-	${BASE_COMMAND} rm -f
+	${BASE_COMMAND} rm
 
 
 up:
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ start: @@
     stop:
     	${BASE_COMMAND} stop
-    	${BASE_COMMAND} rm -f
+    	${BASE_COMMAND} rm
     up:
@@ Expand Down @@