[MM-26886]: check enterprise prereqs before running tests (#15083)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
38557c4023
Коммит
7e3d76b9a2
13
Makefile
13
Makefile
@@ -249,6 +249,11 @@ pluginapi: ## Generates api and hooks glue code for plugins
|
|||||||
check-prereqs: ## Checks prerequisite software status.
|
check-prereqs: ## Checks prerequisite software status.
|
||||||
./scripts/prereq-check.sh
|
./scripts/prereq-check.sh
|
||||||
|
|
||||||
|
check-prereqs-enterprise: ## Checks prerequisite software status for enterprise.
|
||||||
|
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||||
|
./scripts/prereq-check-enterprise.sh
|
||||||
|
endif
|
||||||
|
|
||||||
check-style: golangci-lint plugin-checker vet ## Runs golangci against all packages
|
check-style: golangci-lint plugin-checker vet ## Runs golangci against all packages
|
||||||
|
|
||||||
test-te-race: ## Checks for race conditions in the team edition.
|
test-te-race: ## Checks for race conditions in the team edition.
|
||||||
@@ -261,7 +266,7 @@ test-te-race: ## Checks for race conditions in the team edition.
|
|||||||
$(GO) test $(GOFLAGS) -race -run=$(TESTS) -test.timeout=4000s $$package || exit 1; \
|
$(GO) test $(GOFLAGS) -race -run=$(TESTS) -test.timeout=4000s $$package || exit 1; \
|
||||||
done
|
done
|
||||||
|
|
||||||
test-ee-race: ## Checks for race conditions in the enterprise edition.
|
test-ee-race: check-prereqs-enterprise ## Checks for race conditions in the enterprise edition.
|
||||||
@echo Testing EE race conditions
|
@echo Testing EE race conditions
|
||||||
|
|
||||||
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||||
@@ -312,7 +317,7 @@ gomodtidy:
|
|||||||
fi;
|
fi;
|
||||||
@rm go.*.orig;
|
@rm go.*.orig;
|
||||||
|
|
||||||
test-server: start-docker go-junit-report do-cover-file ## Runs tests.
|
test-server: check-prereqs-enterprise 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
|
||||||
@@ -320,11 +325,11 @@ else
|
|||||||
endif
|
endif
|
||||||
./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(ALL_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)"
|
./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(ALL_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)"
|
||||||
|
|
||||||
test-server-ee: start-docker go-junit-report do-cover-file ## Runs EE tests.
|
test-server-ee: check-prereqs-enterprise start-docker go-junit-report do-cover-file ## Runs EE tests.
|
||||||
@echo Running only EE tests
|
@echo Running only EE tests
|
||||||
./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)"
|
./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)"
|
||||||
|
|
||||||
test-server-quick: ## Runs only quick tests.
|
test-server-quick: check-prereqs-enterprise ## Runs only quick tests.
|
||||||
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||||
@echo Running all tests
|
@echo Running all tests
|
||||||
$(GO) test $(GOFLAGS) -short $(ALL_PACKAGES)
|
$(GO) test $(GOFLAGS) -short $(ALL_PACKAGES)
|
||||||
|
|||||||
11
scripts/prereq-check-enterprise.sh
Исполняемый файл
11
scripts/prereq-check-enterprise.sh
Исполняемый файл
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
check_prereq()
|
||||||
|
{
|
||||||
|
local dependency=$1
|
||||||
|
type "$dependency" >/dev/null 2>&1 || { echo >&2 "Mattermost Enterprise requires '$dependency' but it doesn't appear to be installed. Aborting."; exit 1; }
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Checking enterprise prerequisites"
|
||||||
|
|
||||||
|
check_prereq 'xmlsec1'
|
||||||
Ссылка в новой задаче
Block a user