MM-26882: Ensure to start docker containers during test (#15113)
* MM-26882: Ensure to start docker containers during test This starts up docker containers which can help avoid failures during a test run if a developers forgets to manually start them. * Start LDAP if EE build
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c65a0e9f9c
Коммит
fb0fa2a726
8
Makefile
8
Makefile
@@ -128,6 +128,12 @@ ifeq ($(RUN_SERVER_IN_BACKGROUND),true)
|
|||||||
RUN_IN_BACKGROUND := &
|
RUN_IN_BACKGROUND := &
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||||
|
ifeq (,$(findstring openldap,$(ENABLED_DOCKER_SERVICES)))
|
||||||
|
ENABLED_DOCKER_SERVICES:=$(ENABLED_DOCKER_SERVICES) openldap
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
start-docker: ## Starts the docker containers for local development.
|
start-docker: ## Starts the docker containers for local development.
|
||||||
ifneq ($(IS_CI),false)
|
ifneq ($(IS_CI),false)
|
||||||
@echo CI Build: skipping docker start
|
@echo CI Build: skipping docker start
|
||||||
@@ -317,7 +323,7 @@ gomodtidy:
|
|||||||
fi;
|
fi;
|
||||||
@rm go.*.orig;
|
@rm go.*.orig;
|
||||||
|
|
||||||
test-server: check-prereqs-enterprise go-junit-report do-cover-file ## Runs tests.
|
test-server: check-prereqs-enterprise start-docker go-junit-report do-cover-file ## Runs tests.
|
||||||
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||||
@echo Running all tests
|
@echo Running all tests
|
||||||
else
|
else
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user