root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rabbitmq-*test.mk: Fix latest regressions on our side w.r.t *-on-concourse 

Unfortunately, the *-on-concourse targets still don't work: fly(1), the
Concourse CLI, looks to have regressed even more: it doesn't upload all
inputs. Half of them are just empty directories.

Obviously, compiling anything fails because if this.
This commit is contained in:
Jean-Sébastien Pédron 2019-06-25 18:23:54 +02:00
parent 683bed4802
commit f12002e2f3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/rabbit_common/mk/rabbitmq-early-test.mk vendored
View File

@ -22,6 +22,7 @@ DIALYZER_OPTS ?= -Werror_handling -Wrace_conditions
ifneq ($(words $(filter %-on-concourse,$(MAKECMDGOALS))),0) ifneq ($(words $(filter %-on-concourse,$(MAKECMDGOALS))),0)
TEST_DEPS += ci $(RMQ_CI_CT_HOOKS) TEST_DEPS += ci $(RMQ_CI_CT_HOOKS)
NO_AUTOPATCH += ci $(RMQ_CI_CT_HOOKS)
dep_ci = git git@github.com:rabbitmq/rabbitmq-ci master dep_ci = git git@github.com:rabbitmq/rabbitmq-ci master
endif endif

4
deps/rabbit_common/mk/rabbitmq-test.mk vendored
View File

@ -22,7 +22,7 @@ xref: $(ERLANG_MK_RECURSIVE_DEPS_LIST)
# -------------------------------------------------------------------- # --------------------------------------------------------------------
FLY ?= fly FLY ?= fly
FLY_TARGET ?= $(shell $(FLY) targets | awk '/ci-aws\.rabbitmq\.com/ { print $$1; }') FLY_TARGET ?= $(shell $(FLY) targets | awk '/ci\.rabbitmq\.com/ { print $$1; }')
CONCOURSE_TASK = $(ERLANG_MK_TMP)/concourse-task.yaml CONCOURSE_TASK = $(ERLANG_MK_TMP)/concourse-task.yaml
@ -71,7 +71,7 @@ endif
$(verbose) test -d "$(PIPELINE_DIR)" $(verbose) test -d "$(PIPELINE_DIR)"
$(verbose) echo ' MAKE_TARGET: "$*"' >> "$(CONCOURSE_TASK)" $(verbose) echo ' MAKE_TARGET: "$*"' >> "$(CONCOURSE_TASK)"
$(FLY) -t $(FLY_TARGET) execute \ $(FLY) -t $(FLY_TARGET) execute \
--config "$(CONCOURSE_TASK)" \ --config="$(CONCOURSE_TASK)" \
$(foreach input,$(TASK_INPUTS), \ $(foreach input,$(TASK_INPUTS), \
$(if $(filter $(PROJECT),$(input)), \ $(if $(filter $(PROJECT),$(input)), \
--input="$(input)=.", \ --input="$(input)=.", \