Makefile: Import cluster-other-node target locally

This target, initially in rabbitmq-common/mk/rabbitmq-run.mk, is only
used by this project.

[#127356157]

Author: dumbbell

Makefile

@@ -37,3 +37,12 @@ clean:
 
 distclean: clean
 	$(MAKE) -C $(DEPS_DIR)/rabbitmq_codegen clean
+
+.PHONY: cluster-other-node
+
+cluster-other-node:
+	$(exec_verbose) $(RABBITMQCTL) -n $(OTHER_NODE) stop_app
+	$(verbose) $(RABBITMQCTL) -n $(OTHER_NODE) reset
+	$(verbose) $(RABBITMQCTL) -n $(OTHER_NODE) join_cluster \
+	  $(if $(MAIN_NODE),$(MAIN_NODE),$(RABBITMQ_NODENAME)@$$(hostname -s))
+	$(verbose) $(RABBITMQCTL) -n $(OTHER_NODE) start_app

src/main/scripts/manage_test_broker.groovy

@@ -33,9 +33,9 @@ case ~/^create-test-cluster$/:
 
   command = [
     properties['make.bin'],
-    '-C', properties['rabbitmq.dir'],
     '--no-print-directory',
     'cluster-other-node',
+    "RABBITMQCTL=${properties['rabbitmqctl.bin']}",
     "DEPS_DIR=${properties['deps.dir']}",
     "OTHER_NODE=${nodename}",
     "MAIN_NODE=${target}"