Merge branch 'stable'

Author: dumbbell

mk/rabbitmq-early-test.mk

@@ -3,7 +3,7 @@
 # --------------------------------------------------------------------
 
 ifneq ($(words $(filter %-on-concourse,$(MAKECMDGOALS))),0)
-TEST_DEPS += ci
+TEST_DEPS += ci $(RMQ_CI_CT_HOOKS)
 dep_ci = git [email protected]:rabbitmq/rabbitmq-ci master
 endif
 

mk/rabbitmq-test.mk

@@ -30,8 +30,6 @@ $(CONCOURSE_TASK): $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST)
 	$(verbose) cat $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST) | while read -r file; do \
 		echo "  - name: $$(basename "$$file")" >> "$@"; \
 		done
-	$(verbose) $(foreach hook,$(RMQ_CI_CT_HOOKS), \
-		echo '  - name: $(hook)' >> "$@")
 	$(verbose) echo 'outputs:' >> "$@"
 	$(verbose) echo '  - name: test-output' >> "$@"
 ifeq ($(CONCOURSE_PLATFORM),linux)