WIP

Author: lhoguin

.github/workflows/test-plugin-make.yaml

@@ -146,7 +146,7 @@ jobs:
     - name: RUN TESTS
       if: inputs.plugin != 'rabbitmq_peer_discovery_aws'
       run: |
-        make -C deps/${{ inputs.plugin }} parallel-ct RABBITMQ_METADATA_STORE=${{ matrix.metadata_store }}
+        make -C deps/${{ inputs.plugin }} parallel-ct-set-1 RABBITMQ_METADATA_STORE=${{ matrix.metadata_store }}
 #        echo "Tests in shard:"
 #        cat ${{ steps.shard.outputs.file }}
 #        echo ""
@@ -161,10 +161,11 @@ jobs:
 #          --test_env RABBITMQ_METADATA_STORE=${{ matrix.metadata_store }} \
 #          --build_tests_only \
 #          --verbose_failures
-#    - name: UPLOAD TEST LOGS
-#      if: always()
-#      uses: actions/upload-artifact@v4
-#      with:
-#        name: bazel-testlogs-${{ inputs.plugin }}-${{ inputs.shard_index }}-${{ matrix.erlang_version }}-${{ matrix.metadata_store }}
-#        path: |
-#          bazel-testlogs/deps/${{ inputs.plugin }}/*
+    - name: UPLOAD TEST LOGS
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: Common Test logs (${{ inputs.plugin }}-1-${{ matrix.erlang_version }}-${{ matrix.metadata_store }})
+        path: |
+          logs/
+          !logs/**/log_private

deps/rabbit/Makefile

@@ -235,7 +235,7 @@ define ct_master.erl
 	peer:call(Pid2, persistent_term, put, [rabbit_ct_tcp_port_base, 25000]),
 	peer:call(Pid3, persistent_term, put, [rabbit_ct_tcp_port_base, 27000]),
 	peer:call(Pid4, persistent_term, put, [rabbit_ct_tcp_port_base, 29000]),
-	ct_master:run("ct.test.spec"),
+	ct_master:run("$1"),
 	peer:stop(Pid4),
 	peer:stop(Pid3),
 	peer:stop(Pid2),
@@ -257,13 +257,53 @@ endef
 #PARALLEL_CT_NUM_NODES ?= 4
 #PARALLEL_CT_NODE_NAME = rabbit_shard$1@localhost
 #PARALLEL_CT_NODE_INIT_FUN = fun(Pid, Num) -> peer:call(Pid, net_kernel, set_net_ticktime, [5]), peer:call(Pid, persistent_term, put, [rabbit_ct_tcp_port_base, 21000 + 2000 * Num]) end
-#
+
 #PARALLEL_CT_NUM_SETS = 8
-#
-#PARALLEL_CT_SET_1 = amqp_address amqp_auth amqp_client amqp_credit_api_v2 amqp_proxy_protocol \
-#    amqp_system amqpl_consumer_ack amqpl_direct_reply_to amqqueue_backward_compatibility \
-#    backing_queue bindings channel_interceptor channel_operation_timeout classic_queue classic_queue_prop
-#
+
+PARALLEL_CT_SET_1_A = amqp_client # 170s
+PARALLEL_CT_SET_1_B = amqp_address amqp_auth amqp_credit_api_v2 amqp_system # 150s
+PARALLEL_CT_SET_1_C = amqp_proxy_protocol amqpl_consumer_ack amqpl_direct_reply_to backing_queue bindings # 151s
+PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channel_operation_timeout classic_queue classic_queue_prop # 143s
+
+PARALLEL_CT_SET_1 = $(sort $(PARALLEL_CT_SET_1_A) $(PARALLEL_CT_SET_1_B) $(PARALLEL_CT_SET_1_C) $(PARALLEL_CT_SET_1_D))
+
+define tpl_parallel_ct_test_spec
+{logdir, "logs/"}.
+{logdir, master, "logs/"}.
+{create_priv_dir, all_nodes, auto_per_run}.
+
+{node, shard1, 'rabbit_shard1@localhost'}.
+{node, shard2, 'rabbit_shard2@localhost'}.
+{node, shard3, 'rabbit_shard3@localhost'}.
+{node, shard4, 'rabbit_shard4@localhost'}.
+
+{define, 'Set1', [$(call comma_list,$(addsuffix _SUITE,$1))]}.
+{define, 'Set2', [$(call comma_list,$(addsuffix _SUITE,$2))]}.
+{define, 'Set3', [$(call comma_list,$(addsuffix _SUITE,$3))]}.
+{define, 'Set4', [$(call comma_list,$(addsuffix _SUITE,$4))]}.
+
+{suites, shard1, "test/", 'Set1'}.
+{suites, shard2, "test/", 'Set2'}.
+{suites, shard3, "test/", 'Set3'}.
+{suites, shard4, "test/", 'Set4'}.
+endef
+
+tpl_parallel_ct_test_spec_set_1 = $(call tpl_parallel_ct_test_spec,$(PARALLEL_CT_SET_1_A),$(PARALLEL_CT_SET_1_B),$(PARALLEL_CT_SET_1_C),$(PARALLEL_CT_SET_1_D))
+
+parallel-ct-set-1: test-build
+	$(verbose) mkdir -p $(CT_LOGS_DIR)
+	$(verbose) $(call core_render,tpl_parallel_ct_test_spec_set_1,ct.set-1.spec)
+	$(call erlang,$(call ct_master.erl,ct.set-1.spec),-sname parallel_ct_$(PROJECT)@localhost -hidden -kernel net_ticktime 5)
+
+
+
+
+
+
+
+
+
+
 #PARALLEL_CT_SET_2 = cluster config_schema confirms_rejects consumer_timeout crashing_queues \
 #    deprecated_features direct_exchange_routing_v2 disconnect_detected_during_alarm \
 #    disk_monitor dynamic_qq exchanges rabbit_stream_queue
@@ -364,10 +404,9 @@ endef
 #,   upgrade_preparation
 #,   vhost
 
-
 parallel-ct: test-build
 	$(verbose) mkdir -p $(CT_LOGS_DIR)
-	$(call erlang,$(ct_master.erl),-sname parallel_ct_$(PROJECT)@localhost -hidden -kernel net_ticktime 5)
+	$(call erlang,$(call ct_master.erl,ct.test.spec),-sname parallel_ct_$(PROJECT)@localhost -hidden -kernel net_ticktime 5)
 
 # --------------------------------------------------------------------
 # Compilation.