Skip to content

Commit

Permalink
Revert "Disable rabbitmq_auth_backend_ldap suites"
Browse files Browse the repository at this point in the history
This reverts commit 1a28a5a.

The proper way of doing this is via 'gmake actions-workflows'
  • Loading branch information
michaelklishin committed Oct 22, 2024
1 parent e7e79a8 commit ee3673f
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/check-build-system-equivalence.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ env:
erlang_version: ${{ inputs.erlang_version || github.event.inputs.erlang_version }}
elixir_version: ${{ inputs.elixir_version || github.event.inputs.elixir_version }}
VERSION: ${{ inputs.project_version || github.event.inputs.project_version }}
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
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
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
jobs:
build-with-bazel:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/test-mixed-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,24 @@ jobs:
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
plugin: rabbitmq_auth_backend_http
secrets: inherit
test-rabbitmq_auth_backend_ldap-mixed:
needs:
- check-workflow
- test-rabbit-0-mixed
- test-rabbit-1-mixed
- test-rabbit-2-mixed
- test-rabbit-3-mixed
- test-rabbit-4-mixed
- test-rabbit-5-mixed
- test-rabbit-6-mixed
- test-rabbit-7-mixed
- test-rabbit-8-mixed
- test-rabbit-9-mixed
uses: ./.github/workflows/test-plugin-mixed.yaml
with:
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
plugin: rabbitmq_auth_backend_ldap
secrets: inherit
test-rabbitmq_auth_backend_oauth2-mixed:
needs:
- check-workflow
Expand Down Expand Up @@ -1133,6 +1151,7 @@ jobs:
- test-rabbitmq_amqp1_0-mixed
- test-rabbitmq_auth_backend_cache-mixed
- test-rabbitmq_auth_backend_http-mixed
- test-rabbitmq_auth_backend_ldap-mixed
- test-rabbitmq_auth_backend_oauth2-mixed
- test-rabbitmq_auth_mechanism_ssl-mixed
- test-rabbitmq_aws-mixed
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/test-plugin-mixed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,20 @@ jobs:
if: inputs.plugin == 'rabbit'
run: |
# reduce sandboxing so that maven works
cat << EOF >> user.bazelrc
build --strategy=TestRunner=local
EOF
- name: deps/rabbitmq_auth_backend_ldap SETUP
if: inputs.plugin == 'rabbitmq_auth_backend_ldap'
run: |
sudo apt-get update && \
sudo apt-get install -y \
ldap-utils \
slapd
sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service
sudo systemctl disable apparmor.service
cat << EOF >> user.bazelrc
build --strategy=TestRunner=local
EOF
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/test-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,20 @@ jobs:
if: inputs.plugin == 'rabbit'
run: |
# reduce sandboxing so that maven works
cat << EOF >> user.bazelrc
build --strategy=TestRunner=local
EOF
- name: deps/rabbitmq_auth_backend_ldap SETUP
if: inputs.plugin == 'rabbitmq_auth_backend_ldap'
run: |
sudo apt-get update && \
sudo apt-get install -y \
ldap-utils \
slapd
sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service
sudo systemctl disable apparmor.service
cat << EOF >> user.bazelrc
build --strategy=TestRunner=local
EOF
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,24 @@ jobs:
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
plugin: rabbitmq_auth_backend_http
secrets: inherit
test-rabbitmq_auth_backend_ldap:
needs:
- check-workflow
- test-rabbit-0
- test-rabbit-1
- test-rabbit-2
- test-rabbit-3
- test-rabbit-4
- test-rabbit-5
- test-rabbit-6
- test-rabbit-7
- test-rabbit-8
- test-rabbit-9
uses: ./.github/workflows/test-plugin.yaml
with:
repo_cache_key: ${{ needs.check-workflow.outputs.repo_cache_key }}
plugin: rabbitmq_auth_backend_ldap
secrets: inherit
test-rabbitmq_auth_backend_oauth2:
needs:
- check-workflow
Expand Down Expand Up @@ -1074,6 +1092,7 @@ jobs:
- test-rabbitmq_amqp1_0
- test-rabbitmq_auth_backend_cache
- test-rabbitmq_auth_backend_http
- test-rabbitmq_auth_backend_ldap
- test-rabbitmq_auth_backend_oauth2
- test-rabbitmq_auth_mechanism_ssl
- test-rabbitmq_aws
Expand Down

0 comments on commit ee3673f

Please sign in to comment.