make: Remove rabbitmq-tests.mk
Everything in this file seems to be dead code except ct-slow/ct-fast, which have been replaced by their equivalent in the rabbit Makefile.
This commit is contained in:
parent
11a9148bba
commit
7e7e6feb9d
|
@ -38,7 +38,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
|
|||
rabbit_common/mk/rabbitmq-hexpm.mk \
|
||||
rabbit_common/mk/rabbitmq-dist.mk \
|
||||
rabbit_common/mk/rabbitmq-run.mk \
|
||||
rabbit_common/mk/rabbitmq-test.mk \
|
||||
rabbit_common/mk/rabbitmq-tools.mk
|
||||
|
||||
DEP_PLUGINS += elvis_mk
|
||||
|
|
|
@ -42,7 +42,6 @@ DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
|
|||
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
|
||||
rabbit_common/mk/rabbitmq-hexpm.mk \
|
||||
rabbit_common/mk/rabbitmq-dist.mk \
|
||||
rabbit_common/mk/rabbitmq-test.mk \
|
||||
rabbit_common/mk/rabbitmq-tools.mk
|
||||
|
||||
PLT_APPS = eunit
|
||||
|
|
|
@ -48,7 +48,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
|
|||
rabbit_common/mk/rabbitmq-hexpm.mk \
|
||||
rabbit_common/mk/rabbitmq-dist.mk \
|
||||
rabbit_common/mk/rabbitmq-run.mk \
|
||||
rabbit_common/mk/rabbitmq-test.mk \
|
||||
rabbit_common/mk/rabbitmq-tools.mk
|
||||
|
||||
PLT_APPS = ssl public_key
|
||||
|
|
|
@ -14,7 +14,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
|
|||
rabbit_common/mk/rabbitmq-hexpm.mk \
|
||||
rabbit_common/mk/rabbitmq-dist.mk \
|
||||
rabbit_common/mk/rabbitmq-run.mk \
|
||||
rabbit_common/mk/rabbitmq-test.mk \
|
||||
rabbit_common/mk/rabbitmq-tools.mk
|
||||
|
||||
include rabbitmq-components.mk
|
||||
|
|
|
@ -158,7 +158,6 @@ DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
|
|||
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
|
||||
rabbit_common/mk/rabbitmq-dist.mk \
|
||||
rabbit_common/mk/rabbitmq-run.mk \
|
||||
rabbit_common/mk/rabbitmq-test.mk \
|
||||
rabbit_common/mk/rabbitmq-tools.mk
|
||||
|
||||
include ../../rabbitmq-components.mk
|
||||
|
@ -222,8 +221,11 @@ SLOW_CT_SUITES := backing_queue \
|
|||
vhost
|
||||
FAST_CT_SUITES := $(filter-out $(sort $(SLOW_CT_SUITES)),$(CT_SUITES))
|
||||
|
||||
ct-fast: CT_SUITES = $(FAST_CT_SUITES)
|
||||
ct-slow: CT_SUITES = $(SLOW_CT_SUITES)
|
||||
ct-fast:
|
||||
$(MAKE) ct CT_SUITES='$(FAST_CT_SUITES)'
|
||||
|
||||
ct-slow:
|
||||
$(MAKE) ct CT_SUITES='$(SLOW_CT_SUITES)'
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# Compilation.
|
||||
|
|
|
@ -42,7 +42,6 @@ DEP_EARLY_PLUGINS = $(PROJECT)/mk/rabbitmq-early-test.mk
|
|||
DEP_PLUGINS = $(PROJECT)/mk/rabbitmq-build.mk \
|
||||
$(PROJECT)/mk/rabbitmq-hexpm.mk \
|
||||
$(PROJECT)/mk/rabbitmq-dist.mk \
|
||||
$(PROJECT)/mk/rabbitmq-test.mk \
|
||||
$(PROJECT)/mk/rabbitmq-tools.mk
|
||||
|
||||
PLT_APPS += mnesia crypto ssl
|
||||
|
@ -56,7 +55,6 @@ HEX_TARBALL_FILES += rabbitmq-components.mk \
|
|||
mk/rabbitmq-dist.mk \
|
||||
mk/rabbitmq-early-test.mk \
|
||||
mk/rabbitmq-hexpm.mk \
|
||||
mk/rabbitmq-test.mk \
|
||||
mk/rabbitmq-tools.mk
|
||||
|
||||
-include development.post.mk
|
||||
|
|
|
@ -14,10 +14,6 @@ ifeq ($(filter rabbitmq-run.mk,$(notdir $(MAKEFILE_LIST))),)
|
|||
include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-run.mk
|
||||
endif
|
||||
|
||||
ifeq ($(filter rabbitmq-test.mk,$(notdir $(MAKEFILE_LIST))),)
|
||||
include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-test.mk
|
||||
endif
|
||||
|
||||
ifeq ($(filter rabbitmq-tools.mk,$(notdir $(MAKEFILE_LIST))),)
|
||||
include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-tools.mk
|
||||
endif
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
.PHONY: ct-slow ct-fast
|
||||
|
||||
ct-slow ct-fast:
|
||||
$(MAKE) ct CT_SUITES='$(CT_SUITES)'
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# Helpers to run Make targets on Concourse.
|
||||
# --------------------------------------------------------------------
|
||||
|
||||
FLY ?= fly
|
||||
FLY_TARGET ?= $(shell $(FLY) targets | awk '/ci\.rabbitmq\.com/ { print $$1; }')
|
||||
|
||||
CONCOURSE_TASK = $(ERLANG_MK_TMP)/concourse-task.yaml
|
||||
|
||||
CI_DIR ?= $(DEPS_DIR)/ci
|
||||
PIPELINE_DIR = $(CI_DIR)/server-release
|
||||
BRANCH_RELEASE = $(shell "$(PIPELINE_DIR)/scripts/map-branch-to-release.sh" "$(base_rmq_ref)")
|
||||
PIPELINE_DATA = $(PIPELINE_DIR)/release-data-$(BRANCH_RELEASE).yaml
|
||||
REPOSITORY_NAME = $(shell "$(PIPELINE_DIR)/scripts/map-erlang-app-and-repository-name.sh" "$(PIPELINE_DATA)" "$(PROJECT)")
|
||||
|
||||
CONCOURSE_PLATFORM ?= linux
|
||||
ERLANG_VERSION ?= $(shell "$(PIPELINE_DIR)/scripts/list-erlang-versions.sh" "$(PIPELINE_DATA)" | head -n 1)
|
||||
TASK_INPUTS = $(shell "$(PIPELINE_DIR)/scripts/list-task-inputs.sh" "$(CONCOURSE_TASK)")
|
||||
|
||||
.PHONY: $(CONCOURSE_TASK)
|
||||
$(CONCOURSE_TASK): $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST)
|
||||
$(gen_verbose) echo 'platform: $(CONCOURSE_PLATFORM)' > "$@"
|
||||
$(verbose) echo 'inputs:' >> "$@"
|
||||
$(verbose) echo ' - name: $(PROJECT)' >> "$@"
|
||||
$(verbose) cat $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST) | while read -r file; do \
|
||||
echo " - name: $$(basename "$$file")" >> "$@"; \
|
||||
done
|
||||
$(verbose) echo 'outputs:' >> "$@"
|
||||
$(verbose) echo ' - name: test-output' >> "$@"
|
||||
ifeq ($(CONCOURSE_PLATFORM),linux)
|
||||
$(verbose) echo 'image_resource:' >> "$@"
|
||||
$(verbose) echo ' type: docker-image' >> "$@"
|
||||
$(verbose) echo ' source:' >> "$@"
|
||||
$(verbose) echo ' repository: pivotalrabbitmq/rabbitmq-server-buildenv' >> "$@"
|
||||
$(verbose) echo ' tag: linux-erlang-$(ERLANG_VERSION)' >> "$@"
|
||||
endif
|
||||
$(verbose) echo 'run:' >> "$@"
|
||||
$(verbose) echo ' path: ci/server-release/scripts/test-erlang-app.sh' >> "$@"
|
||||
$(verbose) echo ' args:' >> "$@"
|
||||
$(verbose) echo " - $(PROJECT)" >> "$@"
|
||||
# This section must be the last because the `%-on-concourse` target
|
||||
# appends other variables.
|
||||
$(verbose) echo 'params:' >> "$@"
|
||||
ifdef V
|
||||
$(verbose) echo ' V: "$(V)"' >> "$@"
|
||||
endif
|
||||
ifdef t
|
||||
$(verbose) echo ' t: "$(t)"' >> "$@"
|
||||
endif
|
||||
|
||||
%-on-concourse: $(CONCOURSE_TASK)
|
||||
$(verbose) test -d "$(PIPELINE_DIR)"
|
||||
$(verbose) echo ' MAKE_TARGET: "$*"' >> "$(CONCOURSE_TASK)"
|
||||
$(FLY) -t $(FLY_TARGET) execute \
|
||||
--config="$(CONCOURSE_TASK)" \
|
||||
$(foreach input,$(TASK_INPUTS), \
|
||||
$(if $(filter $(PROJECT),$(input)), \
|
||||
--input="$(input)=.", \
|
||||
--input="$(input)=$(DEPS_DIR)/$(input)")) \
|
||||
--output="test-output=$(CT_LOGS_DIR)/on-concourse"
|
||||
$(verbose) rm -f "$(CT_LOGS_DIR)/on-concourse/filename"
|
|
@ -12,7 +12,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
|
|||
rabbit_common/mk/rabbitmq-hexpm.mk \
|
||||
rabbit_common/mk/rabbitmq-dist.mk \
|
||||
rabbit_common/mk/rabbitmq-run.mk \
|
||||
rabbit_common/mk/rabbitmq-test.mk \
|
||||
rabbit_common/mk/rabbitmq-tools.mk
|
||||
|
||||
.DEFAULT_GOAL = all
|
||||
|
|
Loading…
Reference in New Issue