make & make CI: Small cleanups
This commit is contained in:
Loïc Hoguin
parent
4c80dde233
commit
aee0cd0079
|
|
@ -112,11 +112,3 @@ jobs:
|
|||
metadata_store: ${{ inputs.metadata_store }}
|
||||
make_target: tests
|
||||
plugin: ${{ matrix.plugin }}
|
||||
|
||||
# @todo Test rabbitmq_cli
|
||||
# @todo Why this step?
|
||||
# - name: CLI COMPILE WARNINGS AS ERRORS
|
||||
# if: inputs.plugin == 'rabbitmq_cli'
|
||||
# run: |
|
||||
# bazel build //deps/rabbitmq_cli:compile_warnings_as_errors \
|
||||
# --verbose_failures
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ on:
|
|||
push:
|
||||
branches:
|
||||
- main
|
||||
- bump-otp-for-oci
|
||||
- bump-rbe-*
|
||||
paths:
|
||||
- deps/**
|
||||
- scripts/**
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ name: Test Mixed Version Clusters
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
# - main
|
||||
- main
|
||||
- v4.0.x
|
||||
- v3.13.x
|
||||
- bump-otp-*
|
||||
|
|
@ -20,7 +20,7 @@ on:
|
|||
- BUILD.*
|
||||
- '*.bzl'
|
||||
- '*.bazel'
|
||||
# - .github/workflows/test-mixed-versions.yaml
|
||||
- .github/workflows/test-mixed-versions.yaml
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
|
|
|
|||
|
|
@ -143,17 +143,17 @@ jobs:
|
|||
plugin: trust_store_http
|
||||
secrets: inherit
|
||||
test-rabbit-make:
|
||||
# needs:
|
||||
# - check-workflow
|
||||
# - test-amqp10_client
|
||||
# - test-amqp10_common
|
||||
# - test-amqp_client
|
||||
# - test-oauth2_client
|
||||
# - test-rabbit_common
|
||||
# - test-rabbitmq_ct_client_helpers
|
||||
# - test-rabbitmq_ct_helpers
|
||||
# - test-rabbitmq_stream_common
|
||||
# - test-trust_store_http
|
||||
needs:
|
||||
- check-workflow
|
||||
- test-amqp10_client
|
||||
- test-amqp10_common
|
||||
- test-amqp_client
|
||||
- test-oauth2_client
|
||||
- test-rabbit_common
|
||||
- test-rabbitmq_ct_client_helpers
|
||||
- test-rabbitmq_ct_helpers
|
||||
- test-rabbitmq_stream_common
|
||||
- test-trust_store_http
|
||||
uses: ./.github/workflows/test-plugin-make.yaml
|
||||
with:
|
||||
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
|
||||
|
|
|
|||
|
|
@ -217,6 +217,11 @@ ct-slow:
|
|||
|
||||
CT_OPTS += -ct_hooks rabbit_ct_hook []
|
||||
|
||||
# Parallel CT.
|
||||
#
|
||||
# @todo We must ensure that the CT_OPTS also apply to ct-master
|
||||
# @todo We should probably refactor ct_master.erl to have node init in a separate .erl
|
||||
|
||||
define ct_master.erl
|
||||
StartOpts = #{
|
||||
host => "localhost",
|
||||
|
|
@ -243,20 +248,6 @@ define ct_master.erl
|
|||
halt()
|
||||
endef
|
||||
|
||||
# @todo We must ensure that the CT_OPTS also apply to ct-master
|
||||
# @todo We should probably refactor ct_master.erl to have node init in a separate .erl
|
||||
# @todo We would benefit from having rabbit nodes started with peer (no leftovers)
|
||||
# @todo We need ct-master to be expanded to all components and not just rabbit
|
||||
# @todo Generate ct.test.spec from Makefile variables instead of hardcoded for ct-master
|
||||
|
||||
|
||||
#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_A = amqp_client unit_cluster_formation_locking_mocks unit_cluster_formation_sort_nodes unit_collections unit_config_value_encryption unit_connection_tracking
|
||||
PARALLEL_CT_SET_1_B = amqp_address amqp_auth amqp_credit_api_v2 amqp_system signal_handling single_active_consumer unit_access_control_authn_authz_context_propagation unit_access_control_credential_validation unit_amqp091_content_framing unit_amqp091_server_properties unit_app_management
|
||||
PARALLEL_CT_SET_1_C = amqp_proxy_protocol amqpl_consumer_ack amqpl_direct_reply_to backing_queue bindings rabbit_db_maintenance rabbit_db_msup rabbit_db_policy rabbit_db_queue rabbit_db_topic_exchange rabbit_direct_reply_to_prop cluster_limit cluster_minority term_to_binary_compat_prop topic_permission transactions unicode unit_access_control
|
||||
|
|
@ -289,8 +280,6 @@ ifneq ($(filter-out $(SEQUENTIAL_CT_SUITES) $(PARALLEL_CT_SUITES),$(CT_SUITES)),
|
|||
$(error Some test suites in CT_SUITES but not configured for CI.)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
define tpl_parallel_ct_test_spec
|
||||
{logdir, "$(CT_LOGS_DIR)"}.
|
||||
{logdir, master, "$(CT_LOGS_DIR)"}.
|
||||
|
|
@ -323,13 +312,7 @@ endef
|
|||
|
||||
$(foreach set,1 2 3 4,$(eval $(call parallel_ct_set_target,$(set))))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# @todo Generate ct.test.spec from Makefile variables instead of hardcoded for ct-master
|
||||
|
||||
parallel-ct: test-build
|
||||
$(verbose) mkdir -p $(CT_LOGS_DIR)
|
||||
|
|
|
|||
|
|
@ -60,10 +60,8 @@ include ../../erlang.mk
|
|||
clean::
|
||||
if test -d test/java_SUITE_data; then cd test/java_SUITE_data && $(MAKE) clean; fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Parallel CT.
|
||||
#
|
||||
# @todo Move most of this in common files.
|
||||
|
||||
define ct_master.erl
|
||||
|
|
@ -104,8 +102,6 @@ ifneq ($(filter-out $(PARALLEL_CT_SUITES),$(CT_SUITES)),)
|
|||
$(error Some test suites in CT_SUITES but not configured for CI.)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
define tpl_parallel_ct_test_spec
|
||||
{logdir, "$(CT_LOGS_DIR)"}.
|
||||
{logdir, master, "$(CT_LOGS_DIR)"}.
|
||||
|
|
|
|||
|
|
@ -61,9 +61,6 @@ dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
|
|||
dep_stdout_formatter = hex 0.2.4
|
||||
dep_sysmon_handler = hex 1.3.0
|
||||
|
||||
# @todo Move up in the list later.
|
||||
dep_osiris = git https://github.com/rabbitmq/osiris v1.8.3
|
||||
|
||||
# RabbitMQ applications found in the monorepo.
|
||||
#
|
||||
# Note that rabbitmq_server_release is not a real application
|
||||
|
|
|
|||
Loading…
Reference in New Issue