Skip to content

Commit 68ce2e8

Browse files
michaelklishinmichaelklishin
committed
Revert "Temporarily disable LDAP tests in Actions"
This reverts commit 980da85.
1 parent 467f178 commit 68ce2e8

File tree

5 files changed

+63
-63
lines changed

5 files changed

+63
-63
lines changed

‎.github/workflows/check-build-system-equivalence.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ env:
3232
erlang_version: ${{ inputs.erlang_version || github.event.inputs.erlang_version }}
3333
elixir_version: ${{ inputs.elixir_version || github.event.inputs.elixir_version }}
3434
VERSION: ${{ inputs.project_version || github.event.inputs.project_version }}
35-
PLUGINS: amqp10_common amqp10_client rabbitmq_amqp1_0 rabbitmq_auth_backend_cache rabbitmq_auth_backend_http rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl rabbitmq_consistent_hash_exchange rabbitmq_event_exchange rabbitmq_federation rabbitmq_jms_topic_exchange rabbitmq_mqtt rabbitmq_random_exchange rabbitmq_recent_history_exchange rabbitmq_sharding rabbitmq_shovel rabbitmq_stomp rabbitmq_stream rabbitmq_trust_store rabbitmq_web_dispatch rabbitmq_management_agent rabbitmq_management rabbitmq_prometheus rabbitmq_federation_management rabbitmq_shovel_management rabbitmq_stream_management rabbitmq_top rabbitmq_tracing rabbitmq_web_mqtt rabbitmq_web_mqtt_examples rabbitmq_web_stomp rabbitmq_web_stomp_examples rabbitmq_aws rabbitmq_peer_discovery_common rabbitmq_peer_discovery_aws rabbitmq_peer_discovery_k8s rabbitmq_peer_discovery_consul rabbitmq_peer_discovery_etcd
35+
PLUGINS: amqp10_common amqp10_client rabbitmq_amqp1_0 rabbitmq_auth_backend_cache rabbitmq_auth_backend_http rabbitmq_auth_backend_ldap rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl rabbitmq_consistent_hash_exchange rabbitmq_event_exchange rabbitmq_federation rabbitmq_jms_topic_exchange rabbitmq_mqtt rabbitmq_random_exchange rabbitmq_recent_history_exchange rabbitmq_sharding rabbitmq_shovel rabbitmq_stomp rabbitmq_stream rabbitmq_trust_store rabbitmq_web_dispatch rabbitmq_management_agent rabbitmq_management rabbitmq_prometheus rabbitmq_federation_management rabbitmq_shovel_management rabbitmq_stream_management rabbitmq_top rabbitmq_tracing rabbitmq_web_mqtt rabbitmq_web_mqtt_examples rabbitmq_web_stomp rabbitmq_web_stomp_examples rabbitmq_aws rabbitmq_peer_discovery_common rabbitmq_peer_discovery_aws rabbitmq_peer_discovery_k8s rabbitmq_peer_discovery_consul rabbitmq_peer_discovery_etcd
3636
EXTRA_PLUGINS: accept amqp_client aten base64url cowboy cowlib credentials_obfuscation cuttlefish eetcd enough gen_batch_server getopt gun jose observer_cli osiris prometheus quantile_estimator ra ranch recon redbug seshat stdout_formatter syslog sysmon_handler systemd thoas
3737
jobs:
3838
build-with-bazel:

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -470,24 +470,24 @@ jobs:
470470
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
471471
plugin: rabbitmq_auth_backend_http
472472
secrets: inherit
473-
# test-rabbitmq_auth_backend_ldap-mixed:
474-
# needs:
475-
# - check-workflow
476-
# - test-rabbit-0-mixed
477-
# - test-rabbit-1-mixed
478-
# - test-rabbit-2-mixed
479-
# - test-rabbit-3-mixed
480-
# - test-rabbit-4-mixed
481-
# - test-rabbit-5-mixed
482-
# - test-rabbit-6-mixed
483-
# - test-rabbit-7-mixed
484-
# - test-rabbit-8-mixed
485-
# - test-rabbit-9-mixed
486-
# uses: ./.github/workflows/test-plugin-mixed.yaml
487-
# with:
488-
# repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
489-
# plugin: rabbitmq_auth_backend_ldap
490-
# secrets: inherit
473+
test-rabbitmq_auth_backend_ldap-mixed:
474+
needs:
475+
- check-workflow
476+
- test-rabbit-0-mixed
477+
- test-rabbit-1-mixed
478+
- test-rabbit-2-mixed
479+
- test-rabbit-3-mixed
480+
- test-rabbit-4-mixed
481+
- test-rabbit-5-mixed
482+
- test-rabbit-6-mixed
483+
- test-rabbit-7-mixed
484+
- test-rabbit-8-mixed
485+
- test-rabbit-9-mixed
486+
uses: ./.github/workflows/test-plugin-mixed.yaml
487+
with:
488+
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
489+
plugin: rabbitmq_auth_backend_ldap
490+
secrets: inherit
491491
test-rabbitmq_auth_backend_oauth2-mixed:
492492
needs:
493493
- check-workflow
@@ -1151,7 +1151,7 @@ jobs:
11511151
- test-rabbitmq_amqp1_0-mixed
11521152
- test-rabbitmq_auth_backend_cache-mixed
11531153
- test-rabbitmq_auth_backend_http-mixed
1154-
# - test-rabbitmq_auth_backend_ldap-mixed
1154+
- test-rabbitmq_auth_backend_ldap-mixed
11551155
- test-rabbitmq_auth_backend_oauth2-mixed
11561156
- test-rabbitmq_auth_mechanism_ssl-mixed
11571157
- test-rabbitmq_aws-mixed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,20 @@ jobs:
9393
cat << EOF >> user.bazelrc
9494
build --strategy=TestRunner=local
9595
EOF
96-
# - name: deps/rabbitmq_auth_backend_ldap SETUP
97-
# if: inputs.plugin == 'rabbitmq_auth_backend_ldap'
98-
# run: |
99-
# sudo apt-get update && \
100-
# sudo apt-get install -y \
101-
# ldap-utils \
102-
# slapd
96+
- name: deps/rabbitmq_auth_backend_ldap SETUP
97+
if: inputs.plugin == 'rabbitmq_auth_backend_ldap'
98+
run: |
99+
sudo apt-get update && \
100+
sudo apt-get install -y \
101+
ldap-utils \
102+
slapd
103103
104-
# sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service
105-
# sudo systemctl disable apparmor.service
104+
sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service
105+
sudo systemctl disable apparmor.service
106106
107-
# cat << EOF >> user.bazelrc
108-
# build --strategy=TestRunner=local
109-
# EOF
107+
cat << EOF >> user.bazelrc
108+
build --strategy=TestRunner=local
109+
EOF
110110
- name: deps/rabbitmq_mqtt SETUP
111111
if: inputs.plugin == 'rabbitmq_mqtt'
112112
run: |

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ jobs:
9090
cat << EOF >> user.bazelrc
9191
build --strategy=TestRunner=local
9292
EOF
93-
# - name: deps/rabbitmq_auth_backend_ldap SETUP
94-
# if: inputs.plugin == 'rabbitmq_auth_backend_ldap'
95-
# run: |
96-
# sudo apt-get update && \
97-
# sudo apt-get install -y \
98-
# ldap-utils \
99-
# slapd
93+
- name: deps/rabbitmq_auth_backend_ldap SETUP
94+
if: inputs.plugin == 'rabbitmq_auth_backend_ldap'
95+
run: |
96+
sudo apt-get update && \
97+
sudo apt-get install -y \
98+
ldap-utils \
99+
slapd
100100
101-
# sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service
102-
# sudo systemctl disable apparmor.service
101+
sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service
102+
sudo systemctl disable apparmor.service
103103
104-
# cat << EOF >> user.bazelrc
105-
# build --strategy=TestRunner=local
106-
# EOF
104+
cat << EOF >> user.bazelrc
105+
build --strategy=TestRunner=local
106+
EOF
107107
- name: deps/rabbitmq_mqtt SETUP
108108
if: inputs.plugin == 'rabbitmq_mqtt'
109109
run: |

‎.github/workflows/test.yaml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -411,24 +411,24 @@ jobs:
411411
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
412412
plugin: rabbitmq_auth_backend_http
413413
secrets: inherit
414-
# test-rabbitmq_auth_backend_ldap:
415-
# needs:
416-
# - check-workflow
417-
# - test-rabbit-0
418-
# - test-rabbit-1
419-
# - test-rabbit-2
420-
# - test-rabbit-3
421-
# - test-rabbit-4
422-
# - test-rabbit-5
423-
# - test-rabbit-6
424-
# - test-rabbit-7
425-
# - test-rabbit-8
426-
# - test-rabbit-9
427-
# uses: ./.github/workflows/test-plugin.yaml
428-
# with:
429-
# repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
430-
# plugin: rabbitmq_auth_backend_ldap
431-
# secrets: inherit
414+
test-rabbitmq_auth_backend_ldap:
415+
needs:
416+
- check-workflow
417+
- test-rabbit-0
418+
- test-rabbit-1
419+
- test-rabbit-2
420+
- test-rabbit-3
421+
- test-rabbit-4
422+
- test-rabbit-5
423+
- test-rabbit-6
424+
- test-rabbit-7
425+
- test-rabbit-8
426+
- test-rabbit-9
427+
uses: ./.github/workflows/test-plugin.yaml
428+
with:
429+
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
430+
plugin: rabbitmq_auth_backend_ldap
431+
secrets: inherit
432432
test-rabbitmq_auth_backend_oauth2:
433433
needs:
434434
- check-workflow
@@ -1092,7 +1092,7 @@ jobs:
10921092
- test-rabbitmq_amqp1_0
10931093
- test-rabbitmq_auth_backend_cache
10941094
- test-rabbitmq_auth_backend_http
1095-
# - test-rabbitmq_auth_backend_ldap
1095+
- test-rabbitmq_auth_backend_ldap
10961096
- test-rabbitmq_auth_backend_oauth2
10971097
- test-rabbitmq_auth_mechanism_ssl
10981098
- test-rabbitmq_aws

0 commit comments

Comments
 (0)