Skip to content

Commit c36ee1e

Browse files
ansdansd
committed
WIP fix CI
1 parent e4d20bb commit c36ee1e

File tree

9 files changed

+152
-167
lines changed

9 files changed

+152
-167
lines changed

‎.github/workflows/oci-make.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# https://github.com/marketplace/actions/build-and-push-docker-images
22
name: OCI (make)
33
on:
4-
push:
5-
paths-ignore:
6-
- '.github/workflows/secondary-umbrella.yaml'
7-
- '.github/workflows/update-elixir-patches.yaml'
8-
- '.github/workflows/update-otp-patches.yaml'
9-
workflow_dispatch:
4+
# push:
5+
# paths-ignore:
6+
# - '.github/workflows/secondary-umbrella.yaml'
7+
# - '.github/workflows/update-elixir-patches.yaml'
8+
# - '.github/workflows/update-otp-patches.yaml'
9+
# workflow_dispatch:
1010
env:
1111
REGISTRY_IMAGE: pivotalrabbitmq/rabbitmq
1212
concurrency:

‎.github/workflows/rabbitmq_peer_discovery_aws.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Peer Discovery AWS Integration Test
22
on:
3-
push:
4-
paths-ignore:
5-
- '.github/workflows/secondary-umbrella.yaml'
6-
- '.github/workflows/update-elixir-patches.yaml'
7-
- '.github/workflows/update-otp-patches.yaml'
8-
workflow_dispatch:
3+
# push:
4+
# paths-ignore:
5+
# - '.github/workflows/secondary-umbrella.yaml'
6+
# - '.github/workflows/update-elixir-patches.yaml'
7+
# - '.github/workflows/update-otp-patches.yaml'
8+
# workflow_dispatch:
99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref_name }}
1111
cancel-in-progress: true

‎.github/workflows/test-make-tests.yaml‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
matrix:
2020
make_target:
2121
- parallel-ct-set-1
22-
- parallel-ct-set-2
23-
- parallel-ct-set-3
24-
- parallel-ct-set-4
25-
- ct-clustering_management
26-
- eunit ct-dead_lettering
27-
- ct-feature_flags
28-
- ct-metadata_store_clustering
29-
- ct-quorum_queue
30-
- ct-rabbit_stream_queue
22+
# - parallel-ct-set-2
23+
# - parallel-ct-set-3
24+
# - parallel-ct-set-4
25+
# - ct-clustering_management
26+
# - eunit ct-dead_lettering
27+
# - ct-feature_flags
28+
# - ct-metadata_store_clustering
29+
# - ct-quorum_queue
30+
# - ct-rabbit_stream_queue
3131
uses: ./.github/workflows/test-make-target.yaml
3232
with:
3333
erlang_version: ${{ inputs.erlang_version }}
@@ -36,79 +36,79 @@ jobs:
3636
make_target: ${{ matrix.make_target }}
3737
plugin: rabbit
3838

39-
test-rabbitmq-mqtt:
40-
name: Test rabbitmq_mqtt
41-
uses: ./.github/workflows/test-make-target.yaml
42-
with:
43-
erlang_version: ${{ inputs.erlang_version }}
44-
elixir_version: ${{ inputs.elixir_version }}
45-
metadata_store: ${{ inputs.metadata_store }}
46-
make_target: parallel-ct-set-1
47-
plugin: rabbitmq_mqtt
39+
# test-rabbitmq-mqtt:
40+
# name: Test rabbitmq_mqtt
41+
# uses: ./.github/workflows/test-make-target.yaml
42+
# with:
43+
# erlang_version: ${{ inputs.erlang_version }}
44+
# elixir_version: ${{ inputs.elixir_version }}
45+
# metadata_store: ${{ inputs.metadata_store }}
46+
# make_target: parallel-ct-set-1
47+
# plugin: rabbitmq_mqtt
4848

49-
# The integration_SUITE requires secrets and
50-
# is therefore run from a separate workflow.
51-
test-rabbitmq-peer-discovery-aws:
52-
name: Test rabbitmq_peer_discovery_aws (partially)
53-
uses: ./.github/workflows/test-make-target.yaml
54-
with:
55-
erlang_version: ${{ inputs.erlang_version }}
56-
elixir_version: ${{ inputs.elixir_version }}
57-
metadata_store: ${{ inputs.metadata_store }}
58-
make_target: ct-config_schema ct-unit
59-
plugin: rabbitmq_peer_discovery_aws
49+
# # The integration_SUITE requires secrets and
50+
# # is therefore run from a separate workflow.
51+
# test-rabbitmq-peer-discovery-aws:
52+
# name: Test rabbitmq_peer_discovery_aws (partially)
53+
# uses: ./.github/workflows/test-make-target.yaml
54+
# with:
55+
# erlang_version: ${{ inputs.erlang_version }}
56+
# elixir_version: ${{ inputs.elixir_version }}
57+
# metadata_store: ${{ inputs.metadata_store }}
58+
# make_target: ct-config_schema ct-unit
59+
# plugin: rabbitmq_peer_discovery_aws
6060

61-
test-plugin:
62-
name: Test plugins
63-
strategy:
64-
fail-fast: false
65-
matrix:
66-
plugin:
67-
- amqp10_client
68-
- amqp10_common
69-
- amqp_client
70-
- oauth2_client
71-
- rabbit_common
72-
- rabbitmq_amqp_client
73-
- rabbitmq_auth_backend_cache
74-
- rabbitmq_auth_backend_http
75-
- rabbitmq_auth_backend_ldap
76-
- rabbitmq_auth_backend_oauth2
77-
- rabbitmq_auth_mechanism_ssl
78-
- rabbitmq_aws
79-
- rabbitmq_cli
80-
- rabbitmq_consistent_hash_exchange
81-
- rabbitmq_event_exchange
82-
- rabbitmq_federation
83-
- rabbitmq_federation_management
84-
- rabbitmq_federation_prometheus
85-
- rabbitmq_jms_topic_exchange
86-
- rabbitmq_management
87-
- rabbitmq_management_agent
88-
- rabbitmq_peer_discovery_common
89-
- rabbitmq_peer_discovery_consul
90-
- rabbitmq_peer_discovery_etcd
91-
- rabbitmq_peer_discovery_k8s
92-
- rabbitmq_prelaunch
93-
- rabbitmq_prometheus
94-
- rabbitmq_recent_history_exchange
95-
- rabbitmq_sharding
96-
- rabbitmq_shovel
97-
- rabbitmq_shovel_management
98-
- rabbitmq_shovel_prometheus
99-
- rabbitmq_stomp
100-
- rabbitmq_stream
101-
- rabbitmq_stream_common
102-
- rabbitmq_stream_management
103-
- rabbitmq_tracing
104-
- rabbitmq_trust_store
105-
- rabbitmq_web_dispatch
106-
- rabbitmq_web_mqtt
107-
- rabbitmq_web_stomp
108-
uses: ./.github/workflows/test-make-target.yaml
109-
with:
110-
erlang_version: ${{ inputs.erlang_version }}
111-
elixir_version: ${{ inputs.elixir_version }}
112-
metadata_store: ${{ inputs.metadata_store }}
113-
make_target: tests
114-
plugin: ${{ matrix.plugin }}
61+
# test-plugin:
62+
# name: Test plugins
63+
# strategy:
64+
# fail-fast: false
65+
# matrix:
66+
# plugin:
67+
# - amqp10_client
68+
# - amqp10_common
69+
# - amqp_client
70+
# - oauth2_client
71+
# - rabbit_common
72+
# - rabbitmq_amqp_client
73+
# - rabbitmq_auth_backend_cache
74+
# - rabbitmq_auth_backend_http
75+
# - rabbitmq_auth_backend_ldap
76+
# - rabbitmq_auth_backend_oauth2
77+
# - rabbitmq_auth_mechanism_ssl
78+
# - rabbitmq_aws
79+
# - rabbitmq_cli
80+
# - rabbitmq_consistent_hash_exchange
81+
# - rabbitmq_event_exchange
82+
# - rabbitmq_federation
83+
# - rabbitmq_federation_management
84+
# - rabbitmq_federation_prometheus
85+
# - rabbitmq_jms_topic_exchange
86+
# - rabbitmq_management
87+
# - rabbitmq_management_agent
88+
# - rabbitmq_peer_discovery_common
89+
# - rabbitmq_peer_discovery_consul
90+
# - rabbitmq_peer_discovery_etcd
91+
# - rabbitmq_peer_discovery_k8s
92+
# - rabbitmq_prelaunch
93+
# - rabbitmq_prometheus
94+
# - rabbitmq_recent_history_exchange
95+
# - rabbitmq_sharding
96+
# - rabbitmq_shovel
97+
# - rabbitmq_shovel_management
98+
# - rabbitmq_shovel_prometheus
99+
# - rabbitmq_stomp
100+
# - rabbitmq_stream
101+
# - rabbitmq_stream_common
102+
# - rabbitmq_stream_management
103+
# - rabbitmq_tracing
104+
# - rabbitmq_trust_store
105+
# - rabbitmq_web_dispatch
106+
# - rabbitmq_web_mqtt
107+
# - rabbitmq_web_stomp
108+
# uses: ./.github/workflows/test-make-target.yaml
109+
# with:
110+
# erlang_version: ${{ inputs.erlang_version }}
111+
# elixir_version: ${{ inputs.elixir_version }}
112+
# metadata_store: ${{ inputs.metadata_store }}
113+
# make_target: tests
114+
# plugin: ${{ matrix.plugin }}

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

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,40 @@ concurrency:
1515
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1616
cancel-in-progress: true
1717
jobs:
18-
build-and-xref:
19-
name: Build and Xref
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
erlang_version:
24-
- '26'
25-
- '27'
26-
elixir_version:
27-
- '1.17'
28-
# @todo Add macOS and Windows.
29-
runs-on: ubuntu-latest
30-
timeout-minutes: 30
31-
steps:
32-
- name: CHECKOUT REPOSITORY
33-
uses: actions/checkout@v4
18+
# build-and-xref:
19+
# name: Build and Xref
20+
# strategy:
21+
# fail-fast: false
22+
# matrix:
23+
# erlang_version:
24+
# - '26'
25+
# - '27'
26+
# elixir_version:
27+
# - '1.17'
28+
# # @todo Add macOS and Windows.
29+
# runs-on: ubuntu-latest
30+
# timeout-minutes: 30
31+
# steps:
32+
# - name: CHECKOUT REPOSITORY
33+
# uses: actions/checkout@v4
3434

35-
- name: FETCH TAGS
36-
run: git fetch --tags
35+
# - name: FETCH TAGS
36+
# run: git fetch --tags
3737

38-
- name: SETUP OTP & ELIXIR
39-
uses: erlef/[email protected]
40-
with:
41-
otp-version: ${{ matrix.erlang_version }}
42-
elixir-version: ${{ matrix.elixir_version }}
43-
hexpm-mirrors: |
44-
https://builds.hex.pm
45-
https://cdn.jsdelivr.net/hex
38+
# - name: SETUP OTP & ELIXIR
39+
# uses: erlef/[email protected]
40+
# with:
41+
# otp-version: ${{ matrix.erlang_version }}
42+
# elixir-version: ${{ matrix.elixir_version }}
43+
# hexpm-mirrors: |
44+
# https://builds.hex.pm
45+
# https://cdn.jsdelivr.net/hex
4646

47-
- name: BUILD
48-
run: make
47+
# - name: BUILD
48+
# run: make
4949

50-
- name: XREF
51-
run: make xref
50+
# - name: XREF
51+
# run: make xref
5252

5353
test:
5454
name: Test
@@ -62,23 +62,23 @@ jobs:
6262
- '1.17'
6363
metadata_store:
6464
- mnesia
65-
- khepri
65+
# - khepri
6666
uses: ./.github/workflows/test-make-tests.yaml
6767
with:
6868
erlang_version: ${{ matrix.erlang_version }}
6969
elixir_version: ${{ matrix.elixir_version }}
7070
metadata_store: ${{ matrix.metadata_store }}
7171

72-
type-check:
73-
name: Type check
74-
strategy:
75-
fail-fast: false
76-
matrix:
77-
erlang_version: # Latest OTP
78-
- '27'
79-
elixir_version: # Latest Elixir
80-
- '1.17'
81-
uses: ./.github/workflows/test-make-type-check.yaml
82-
with:
83-
erlang_version: ${{ matrix.erlang_version }}
84-
elixir_version: ${{ matrix.elixir_version }}
72+
# type-check:
73+
# name: Type check
74+
# strategy:
75+
# fail-fast: false
76+
# matrix:
77+
# erlang_version: # Latest OTP
78+
# - '27'
79+
# elixir_version: # Latest Elixir
80+
# - '1.17'
81+
# uses: ./.github/workflows/test-make-type-check.yaml
82+
# with:
83+
# erlang_version: ${{ matrix.erlang_version }}
84+
# elixir_version: ${{ matrix.elixir_version }}

‎.github/workflows/test-management-ui-for-pr.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Test Management UI with Selenium for PRs
22
on:
3-
pull_request:
4-
paths:
5-
- 'deps/**'
6-
- 'selenium/**'
7-
- .github/workflows/test-management-ui-for-pr.yaml
3+
# pull_request:
4+
# paths:
5+
# - 'deps/**'
6+
# - 'selenium/**'
7+
# - .github/workflows/test-management-ui-for-pr.yaml
88
concurrency:
99
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1010
cancel-in-progress: true

‎.github/workflows/test-mixed-versions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- '*.bzl'
2222
- '*.bazel'
2323
- .github/workflows/test-mixed-versions.yaml
24-
pull_request:
24+
# pull_request:
2525
concurrency:
2626
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2727
cancel-in-progress: true

‎deps/rabbit/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@ define ct_master.erl
251251
halt(0)
252252
endef
253253

254-
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
255-
PARALLEL_CT_SET_1_B = amqp_address amqp_auth amqp_credit_api_v2 amqp_filtex 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
256-
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
257-
PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channel_operation_timeout classic_queue classic_queue_prop config_schema peer_discovery_dns peer_discovery_tmp_hidden_node per_node_limit per_user_connection_channel_limit
254+
PARALLEL_CT_SET_1_A = unit_cluster_formation_sort_nodes
255+
PARALLEL_CT_SET_1_B = amqp_system
256+
PARALLEL_CT_SET_1_C = amqp_proxy_protocol
257+
PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility
258258

259259
PARALLEL_CT_SET_2_A = cluster confirms_rejects consumer_timeout rabbit_access_control rabbit_confirms rabbit_core_metrics_gc rabbit_cuttlefish rabbit_db_binding rabbit_db_exchange
260260
PARALLEL_CT_SET_2_B = clustering_recovery crashing_queues deprecated_features direct_exchange_routing_v2 disconnect_detected_during_alarm exchanges unit_gen_server2

‎deps/rabbit/ct.test.spec‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,7 @@
1212
%%
1313

1414
{define, 'Set1', [
15-
amqp_address_SUITE
16-
, amqp_auth_SUITE
17-
, amqp_client_SUITE
18-
, amqp_credit_api_v2_SUITE
19-
, amqp_filtex_SUITE
20-
, amqp_proxy_protocol_SUITE
21-
, amqp_system_SUITE
22-
, amqpl_consumer_ack_SUITE
23-
, amqpl_direct_reply_to_SUITE
24-
, amqqueue_backward_compatibility_SUITE
25-
, backing_queue_SUITE
26-
, bindings_SUITE
27-
, channel_interceptor_SUITE
28-
, channel_operation_timeout_SUITE
29-
, classic_queue_SUITE
30-
, classic_queue_prop_SUITE
15+
amqp_system_SUITE
3116
]}.
3217

3318
{define, 'Set2', [

‎deps/rabbit/test/amqp_system_SUITE.erl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
all() ->
1717
[
18-
{group, dotnet},
19-
{group, java}
18+
{group, dotnet}
19+
% {group, java}
2020
].
2121

2222
groups() ->

0 commit comments

Comments
 (0)