Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move selenium to root (backport #12198) #12213

Merged
merged 3 commits into from
Sep 4, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 4, 2024

Proposed Changes

Selenium tests are end-to-end tests. They currently verify two kind of functionality:

  • management ui
  • messaging protocols authenticating with multiple authentication backends

These tests have lived under deps/rabbitmq-management/selenium folder because they were initially meant for testing the management ui. But now, they are used to test other areas not only the management ui. Therefore, it is more appropriate that these tests live somewhere else, like in the root of this rabbitmq-server repository.

Additionally, the Gihub action that runs the management ui tests have been split into two GHA. One for push to main and another for PRs.

Note: This PR depends on #12165

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

This is an automatic backport of pull request #12198 done by [Mergify](https://mergify.com).

Copy link
Author

mergify bot commented Sep 4, 2024

Cherry-pick of a1206dc has failed:

On branch mergify/bp/v4.0.x/pr-12198
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit a1206dc801.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/test-authnz.yaml
	renamed:    .github/workflows/test-selenium.yaml -> .github/workflows/test-management-ui-for-pr.yaml
	modified:   deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets
	modified:   deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_config_SUITE.erl
	modified:   deps/rabbitmq_auth_backend_oauth2/test/unit_SUITE.erl
	deleted:    deps/rabbitmq_management/selenium/bin/components/rabbitmq
	deleted:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.local
	deleted:    deps/rabbitmq_management/selenium/test/multi-oauth/env.local.devkeycloak
	deleted:    deps/rabbitmq_management/selenium/test/multi-oauth/env.local.prodkeycloak
	deleted:    deps/rabbitmq_management/selenium/test/oauth/env.local
	deleted:    deps/rabbitmq_management/selenium/test/vhosts/Makefile
	new file:   selenium/.gitignore
	renamed:    deps/rabbitmq_management/selenium/Dockerfile -> selenium/Dockerfile
	renamed:    deps/rabbitmq_management/selenium/README.md -> selenium/README.md
	renamed:    deps/rabbitmq_management/selenium/amqp10-roundtriptest/pom.xml -> selenium/amqp10-roundtriptest/pom.xml
	renamed:    deps/rabbitmq_management/selenium/run-amqp10-roundtriptest -> selenium/amqp10-roundtriptest/run
	renamed:    deps/rabbitmq_management/selenium/amqp10-roundtriptest/src/main/java/com/rabbitmq/amqp1_0/RoundTripTest.java -> selenium/amqp10-roundtriptest/src/main/java/com/rabbitmq/amqp1_0/RoundTripTest.java
	renamed:    deps/rabbitmq_management/selenium/bin/components/README.md -> selenium/bin/components/README.md
	renamed:    deps/rabbitmq_management/selenium/bin/components/devkeycloak -> selenium/bin/components/devkeycloak
	renamed:    deps/rabbitmq_management/selenium/bin/components/fakeportal -> selenium/bin/components/fakeportal
	renamed:    deps/rabbitmq_management/selenium/bin/components/fakeproxy -> selenium/bin/components/fakeproxy
	renamed:    deps/rabbitmq_management/selenium/bin/components/keycloak -> selenium/bin/components/keycloak
	renamed:    deps/rabbitmq_management/selenium/bin/components/mock-auth-backend-http -> selenium/bin/components/mock-auth-backend-http
	renamed:    deps/rabbitmq_management/selenium/bin/components/mock-auth-backend-ldap -> selenium/bin/components/mock-auth-backend-ldap
	renamed:    deps/rabbitmq_management/selenium/bin/components/prodkeycloak -> selenium/bin/components/prodkeycloak
	renamed:    deps/rabbitmq_management/selenium/bin/components/proxy -> selenium/bin/components/proxy
	renamed:    deps/rabbitmq_management/selenium/bin/components/selenium -> selenium/bin/components/selenium
	renamed:    deps/rabbitmq_management/selenium/bin/components/uaa -> selenium/bin/components/uaa
	renamed:    deps/rabbitmq_management/selenium/bin/find-template-files -> selenium/bin/find-template-files
	renamed:    deps/rabbitmq_management/selenium/bin/gen-advanced-config -> selenium/bin/gen-advanced-config
	renamed:    deps/rabbitmq_management/selenium/bin/gen-env-file -> selenium/bin/gen-env-file
	renamed:    deps/rabbitmq_management/selenium/bin/gen-httpd-conf -> selenium/bin/gen-httpd-conf
	renamed:    deps/rabbitmq_management/selenium/bin/gen-keycloak-json -> selenium/bin/gen-keycloak-json
	renamed:    deps/rabbitmq_management/selenium/bin/gen-rabbitmq-conf -> selenium/bin/gen-rabbitmq-conf
	renamed:    deps/rabbitmq_management/selenium/bin/gen-uaa-yml -> selenium/bin/gen-uaa-yml
	renamed:    deps/rabbitmq_management/selenium/bin/suite_template -> selenium/bin/suite_template
	renamed:    deps/rabbitmq_management/selenium/fakeportal/app.js -> selenium/fakeportal/app.js
	renamed:    deps/rabbitmq_management/selenium/fakeportal/proxy.js -> selenium/fakeportal/proxy.js
	renamed:    deps/rabbitmq_management/selenium/fakeportal/views/rabbitmq.html -> selenium/fakeportal/views/rabbitmq.html
	renamed:    deps/rabbitmq_management/selenium/full-suite-authnz-messaging -> selenium/full-suite-authnz-messaging
	renamed:    deps/rabbitmq_management/selenium/full-suite-management-ui -> selenium/full-suite-management-ui
	renamed:    deps/rabbitmq_management/selenium/package.json -> selenium/package.json
	renamed:    deps/rabbitmq_management/selenium/run-suites.sh -> selenium/run-suites.sh
	renamed:    deps/rabbitmq_management/selenium/short-suite-management-ui -> selenium/short-suite-management-ui
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-cache-http-backends.sh -> selenium/suites/authnz-messaging/auth-cache-http-backends.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-cache-ldap-backends.sh -> selenium/suites/authnz-messaging/auth-cache-ldap-backends.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-http-backend.sh -> selenium/suites/authnz-messaging/auth-http-backend.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-http-internal-backends-with-internal.sh -> selenium/suites/authnz-messaging/auth-http-internal-backends-with-internal.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-http-internal-backends.sh -> selenium/suites/authnz-messaging/auth-http-internal-backends.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-internal-backend.sh -> selenium/suites/authnz-messaging/auth-internal-backend.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-internal-http-backends.sh -> selenium/suites/authnz-messaging/auth-internal-http-backends.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-ldap-backend.sh -> selenium/suites/authnz-messaging/auth-ldap-backend.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-oauth-backend-with-devproducer.sh -> selenium/suites/authnz-messaging/auth-oauth-backend-with-devproducer.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-messaging/auth-oauth-backend-with-prodproducer.sh -> selenium/suites/authnz-messaging/auth-oauth-backend-with-prodproducer.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh -> selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/basic-auth-with-mgt-prefix.sh -> selenium/suites/authnz-mgt/basic-auth-with-mgt-prefix.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/basic-auth.sh -> selenium/suites/authnz-mgt/basic-auth.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/multi-oauth-with-basic-auth-when-idps-down.sh -> selenium/suites/authnz-mgt/multi-oauth-with-basic-auth-when-idps-down.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/multi-oauth-with-basic-auth.sh -> selenium/suites/authnz-mgt/multi-oauth-with-basic-auth.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/multi-oauth-without-basic-auth-and-resource-label-and-scopes.sh -> selenium/suites/authnz-mgt/multi-oauth-without-basic-auth-and-resource-label-and-scopes.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/multi-oauth-without-basic-auth.sh -> selenium/suites/authnz-mgt/multi-oauth-without-basic-auth.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-and-basic-auth.sh -> selenium/suites/authnz-mgt/oauth-and-basic-auth.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh -> selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix.sh -> selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh -> selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa.sh -> selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-with-keycloak-with-verify-none.sh -> selenium/suites/authnz-mgt/oauth-with-keycloak-with-verify-none.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-with-keycloak.sh -> selenium/suites/authnz-mgt/oauth-with-keycloak.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-with-uaa-and-mgt-prefix.sh -> selenium/suites/authnz-mgt/oauth-with-uaa-and-mgt-prefix.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-with-uaa-down-but-with-basic-auth.sh -> selenium/suites/authnz-mgt/oauth-with-uaa-down-but-with-basic-auth.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-with-uaa-down.sh -> selenium/suites/authnz-mgt/oauth-with-uaa-down.sh
	renamed:    deps/rabbitmq_management/selenium/suites/authnz-mgt/oauth-with-uaa.sh -> selenium/suites/authnz-mgt/oauth-with-uaa.sh
	renamed:    deps/rabbitmq_management/selenium/suites/mgt/definitions.sh -> selenium/suites/mgt/definitions.sh
	renamed:    deps/rabbitmq_management/selenium/suites/mgt/exchanges.sh -> selenium/suites/mgt/exchanges.sh
	renamed:    deps/rabbitmq_management/selenium/suites/mgt/limits.sh -> selenium/suites/mgt/limits.sh
	renamed:    deps/rabbitmq_management/selenium/suites/mgt/mgt-only-exchanges.sh -> selenium/suites/mgt/mgt-only-exchanges.sh
	renamed:    deps/rabbitmq_management/selenium/suites/mgt/vhosts.sh -> selenium/suites/mgt/vhosts.sh
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/advanced.auth-ldap.config -> selenium/test/authnz-msg-protocols/advanced.auth-ldap.config
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/amqp10.js -> selenium/test/authnz-msg-protocols/amqp10.js
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/enabled_plugins -> selenium/test/authnz-msg-protocols/enabled_plugins
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-http.docker -> selenium/test/authnz-msg-protocols/env.auth-http.docker
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-http.local -> selenium/test/authnz-msg-protocols/env.auth-http.local
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-ldap.docker -> selenium/test/authnz-msg-protocols/env.auth-ldap.docker
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-ldap.local -> selenium/test/authnz-msg-protocols/env.auth-ldap.local
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.docker -> selenium/test/authnz-msg-protocols/env.auth-oauth-dev.docker
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.local -> selenium/test/authnz-msg-protocols/env.auth-oauth-dev.local
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.docker -> selenium/test/authnz-msg-protocols/env.auth-oauth-prod.docker
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.local -> selenium/test/authnz-msg-protocols/env.auth-oauth-prod.local
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.docker.devkeycloak -> selenium/test/authnz-msg-protocols/env.docker.devkeycloak
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.docker.prodkeycloak -> selenium/test/authnz-msg-protocols/env.docker.prodkeycloak
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.http-user -> selenium/test/authnz-msg-protocols/env.http-user
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.internal-user -> selenium/test/authnz-msg-protocols/env.internal-user
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.ldap-user -> selenium/test/authnz-msg-protocols/env.ldap-user
	new file:   selenium/test/authnz-msg-protocols/env.local
	new file:   selenium/test/authnz-msg-protocols/env.local.devkeycloak
	new file:   selenium/test/authnz-msg-protocols/env.local.prodkeycloak
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.oauth-devproducer -> selenium/test/authnz-msg-protocols/env.oauth-devproducer
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.oauth-prodproducer -> selenium/test/authnz-msg-protocols/env.oauth-prodproducer
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/imports/users.json -> selenium/test/authnz-msg-protocols/imports/users.json
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/logging.conf -> selenium/test/authnz-msg-protocols/logging.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/mock-auth-backend-http/defaultExpectations.json -> selenium/test/authnz-msg-protocols/mock-auth-backend-http/defaultExpectations.json
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/mock-auth-backend-ldap/import.ldif -> selenium/test/authnz-msg-protocols/mock-auth-backend-ldap/import.ldif
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/mqtt.js -> selenium/test/authnz-msg-protocols/mqtt.js
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth-http.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth-http.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth-ldap.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth-ldap.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-cache-http.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-cache-http.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-cache-ldap.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-cache-ldap.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-http-internal.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-http-internal.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-http.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-http.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-internal-http.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-internal-http.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-internal.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-internal.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-ldap.conf -> selenium/test/authnz-msg-protocols/rabbitmq.auth_backends-ldap.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.backends-oauth.conf -> selenium/test/authnz-msg-protocols/rabbitmq.backends-oauth.conf
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/rabbitmq.conf -> selenium/test/authnz-msg-protocols/rabbitmq.conf
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/ac-administrator-without-vhost-permissions.js -> selenium/test/basic-auth/ac-administrator-without-vhost-permissions.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/ac-management-without-vhost-permissions.js -> selenium/test/basic-auth/ac-management-without-vhost-permissions.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/ac-management.js -> selenium/test/basic-auth/ac-management.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/ac-monitoring-without-vhost-permissions.js -> selenium/test/basic-auth/ac-monitoring-without-vhost-permissions.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/enabled_plugins -> selenium/test/basic-auth/enabled_plugins
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/env.docker.proxy -> selenium/test/basic-auth/env.docker.proxy
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/env.local -> selenium/test/basic-auth/env.local
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/env.local.proxy -> selenium/test/basic-auth/env.local.proxy
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/happy-login.js -> selenium/test/basic-auth/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/httpd-proxy/.htpasswd -> selenium/test/basic-auth/httpd-proxy/.htpasswd
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/httpd-proxy/httpd.conf -> selenium/test/basic-auth/httpd-proxy/httpd.conf
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/imports/users.json -> selenium/test/basic-auth/imports/users.json
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/landing.js -> selenium/test/basic-auth/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/logging.conf -> selenium/test/basic-auth/logging.conf
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/logout.js -> selenium/test/basic-auth/logout.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/rabbitmq.conf -> selenium/test/basic-auth/rabbitmq.conf
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/rabbitmq.mgt-prefix.conf -> selenium/test/basic-auth/rabbitmq.mgt-prefix.conf
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/session-expired.js -> selenium/test/basic-auth/session-expired.js
	renamed:    deps/rabbitmq_management/selenium/test/basic-auth/unauthorized.js -> selenium/test/basic-auth/unauthorized.js
	renamed:    deps/rabbitmq_management/selenium/test/definitions/export.js -> selenium/test/definitions/export.js
	renamed:    deps/rabbitmq_management/selenium/test/definitions/import-newguest-user.json -> selenium/test/definitions/import-newguest-user.json
	renamed:    deps/rabbitmq_management/selenium/test/definitions/import.js -> selenium/test/definitions/import.js
	renamed:    deps/rabbitmq_management/selenium/test/env.docker -> selenium/test/env.docker
	renamed:    deps/rabbitmq_management/selenium/test/env.local -> selenium/test/env.local
	renamed:    deps/rabbitmq_management/selenium/test/env.tls.docker -> selenium/test/env.tls.docker
	renamed:    deps/rabbitmq_management/selenium/test/env.tls.local -> selenium/test/env.tls.local
	renamed:    deps/rabbitmq_management/selenium/test/exchanges/management.js -> selenium/test/exchanges/management.js
	renamed:    deps/rabbitmq_management/selenium/test/limits/users.js -> selenium/test/limits/users.js
	renamed:    deps/rabbitmq_management/selenium/test/limits/virtual-hosts.js -> selenium/test/limits/virtual-hosts.js
	renamed:    deps/rabbitmq_management/selenium/test/mgt-only/enabled_plugins -> selenium/test/mgt-only/enabled_plugins
	renamed:    deps/rabbitmq_management/selenium/test/mgt-only/imports/users.json -> selenium/test/mgt-only/imports/users.json
	renamed:    deps/rabbitmq_management/selenium/test/mgt-only/logging.conf -> selenium/test/mgt-only/logging.conf
	renamed:    deps/rabbitmq_management/selenium/test/mgt-only/rabbitmq.conf -> selenium/test/mgt-only/rabbitmq.conf
	renamed:    deps/rabbitmq_management/selenium/test/mock_http_backend.js -> selenium/test/mock_http_backend.js
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/certs/ca_certificate.pem -> selenium/test/multi-oauth/certs/ca_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/certs/server_rabbitmq_certificate.pem -> selenium/test/multi-oauth/certs/server_rabbitmq_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/certs/server_rabbitmq_key.pem -> selenium/test/multi-oauth/certs/server_rabbitmq_key.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/devkeycloak/ca_certificate.pem -> selenium/test/multi-oauth/devkeycloak/ca_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/devkeycloak/dev-realm.json -> selenium/test/multi-oauth/devkeycloak/dev-realm.json
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/devkeycloak/server_devkeycloak.p12 -> selenium/test/multi-oauth/devkeycloak/server_devkeycloak.p12
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_certificate.pem -> selenium/test/multi-oauth/devkeycloak/server_devkeycloak_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_key.pem -> selenium/test/multi-oauth/devkeycloak/server_devkeycloak_key.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/enabled_plugins -> selenium/test/multi-oauth/enabled_plugins
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/env.docker -> selenium/test/multi-oauth/env.docker
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/env.docker.devkeycloak -> selenium/test/multi-oauth/env.docker.devkeycloak
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/env.docker.prodkeycloak -> selenium/test/multi-oauth/env.docker.prodkeycloak
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/env.local -> selenium/test/multi-oauth/env.local
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.local.devkeycloak -> selenium/test/multi-oauth/env.local.devkeycloak
	renamed:    deps/rabbitmq_management/selenium/test/authnz-msg-protocols/env.local.prodkeycloak -> selenium/test/multi-oauth/env.local.prodkeycloak
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/imports/users.json -> selenium/test/multi-oauth/imports/users.json
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/prodkeycloak/ca_certificate.pem -> selenium/test/multi-oauth/prodkeycloak/ca_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/prodkeycloak/prod-realm.json -> selenium/test/multi-oauth/prodkeycloak/prod-realm.json
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak.p12 -> selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak.p12
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_certificate.pem -> selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_key.pem -> selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_key.pem
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/rabbitmq.basic-management.conf -> selenium/test/multi-oauth/rabbitmq.basic-management.conf
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/rabbitmq.conf -> selenium/test/multi-oauth/rabbitmq.conf
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/rabbitmq.enable-basic-auth.conf -> selenium/test/multi-oauth/rabbitmq.enable-basic-auth.conf
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/rabbitmq.tls.conf -> selenium/test/multi-oauth/rabbitmq.tls.conf
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/rabbitmq.with-resource-label.conf -> selenium/test/multi-oauth/rabbitmq.with-resource-label.conf
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/rabbitmq.with-resource-scopes.conf -> selenium/test/multi-oauth/rabbitmq.with-resource-scopes.conf
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/with-basic-auth-idps-down/happy-login.js -> selenium/test/multi-oauth/with-basic-auth-idps-down/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/with-basic-auth-idps-down/landing.js -> selenium/test/multi-oauth/with-basic-auth-idps-down/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/with-basic-auth/happy-login.js -> selenium/test/multi-oauth/with-basic-auth/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/with-basic-auth/landing.js -> selenium/test/multi-oauth/with-basic-auth/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/without-basic-auth/happy-login.js -> selenium/test/multi-oauth/without-basic-auth/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/multi-oauth/without-basic-auth/landing.js -> selenium/test/multi-oauth/without-basic-auth/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/certs/ca_certificate.pem -> selenium/test/oauth/certs/ca_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/certs/server_rabbitmq_certificate.pem -> selenium/test/oauth/certs/server_rabbitmq_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/certs/server_rabbitmq_key.pem -> selenium/test/oauth/certs/server_rabbitmq_key.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/enabled_plugins -> selenium/test/oauth/enabled_plugins
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.docker -> selenium/test/oauth/env.docker
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.docker.fakeportal -> selenium/test/oauth/env.docker.fakeportal
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.docker.fakeproxy -> selenium/test/oauth/env.docker.fakeproxy
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.docker.keycloak -> selenium/test/oauth/env.docker.keycloak
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.docker.uaa -> selenium/test/oauth/env.docker.uaa
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.enabled_basic_auth -> selenium/test/oauth/env.enabled_basic_auth
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.fakeportal-oauth-provider -> selenium/test/oauth/env.fakeportal-oauth-provider
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.fakeproxy -> selenium/test/oauth/env.fakeproxy
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.keycloak -> selenium/test/oauth/env.keycloak
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.keycloak-oauth-provider -> selenium/test/oauth/env.keycloak-oauth-provider
	new file:   selenium/test/oauth/env.local
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.local.fakeportal -> selenium/test/oauth/env.local.fakeportal
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.local.fakeproxy -> selenium/test/oauth/env.local.fakeproxy
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.local.keycloak -> selenium/test/oauth/env.local.keycloak
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.local.uaa -> selenium/test/oauth/env.local.uaa
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.mgt-prefix -> selenium/test/oauth/env.mgt-prefix
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.uaa -> selenium/test/oauth/env.uaa
	renamed:    deps/rabbitmq_management/selenium/test/oauth/env.uaa-oauth-provider -> selenium/test/oauth/env.uaa-oauth-provider
	renamed:    deps/rabbitmq_management/selenium/test/oauth/imports/users.json -> selenium/test/oauth/imports/users.json
	renamed:    deps/rabbitmq_management/selenium/test/oauth/keycloak/ca_certificate.pem -> selenium/test/oauth/keycloak/ca_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/keycloak/server_keycloak_certificate.pem -> selenium/test/oauth/keycloak/server_keycloak_certificate.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/keycloak/server_keycloak_key.pem -> selenium/test/oauth/keycloak/server_keycloak_key.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/keycloak/signing-key.pem -> selenium/test/oauth/keycloak/signing-key.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/keycloak/test-realm.json -> selenium/test/oauth/keycloak/test-realm.json
	renamed:    deps/rabbitmq_management/selenium/test/oauth/logging.conf -> selenium/test/oauth/logging.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.conf -> selenium/test/oauth/rabbitmq.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.enable-basic-auth.conf -> selenium/test/oauth/rabbitmq.enable-basic-auth.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.fakeportal-mgt-oauth-provider.conf -> selenium/test/oauth/rabbitmq.fakeportal-mgt-oauth-provider.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.idp-initiated.conf -> selenium/test/oauth/rabbitmq.idp-initiated.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.keycloak-mgt-oauth-provider.conf -> selenium/test/oauth/rabbitmq.keycloak-mgt-oauth-provider.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.keycloak-oauth-provider.conf -> selenium/test/oauth/rabbitmq.keycloak-oauth-provider.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.keycloak-verify-none-oauth-provider.conf -> selenium/test/oauth/rabbitmq.keycloak-verify-none-oauth-provider.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.load-user-definitions.conf -> selenium/test/oauth/rabbitmq.load-user-definitions.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.mgt-prefix.conf -> selenium/test/oauth/rabbitmq.mgt-prefix.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.tls.conf -> selenium/test/oauth/rabbitmq.tls.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.uaa-mgt-oauth-provider.conf -> selenium/test/oauth/rabbitmq.uaa-mgt-oauth-provider.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/rabbitmq.uaa-oauth-provider.conf -> selenium/test/oauth/rabbitmq.uaa-oauth-provider.conf
	renamed:    deps/rabbitmq_management/selenium/test/oauth/uaa/log4j2.properties -> selenium/test/oauth/uaa/log4j2.properties
	renamed:    deps/rabbitmq_management/selenium/test/oauth/uaa/signing-key.pem -> selenium/test/oauth/uaa/signing-key.pem
	renamed:    deps/rabbitmq_management/selenium/test/oauth/uaa/uaa.yml -> selenium/test/oauth/uaa/uaa.yml
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-basic-auth-idp-down/happy-login.js -> selenium/test/oauth/with-basic-auth-idp-down/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-basic-auth-idp-down/landing.js -> selenium/test/oauth/with-basic-auth-idp-down/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-basic-auth/happy-login.js -> selenium/test/oauth/with-basic-auth/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-basic-auth/landing.js -> selenium/test/oauth/with-basic-auth/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-basic-auth/unauthorized.js -> selenium/test/oauth/with-basic-auth/unauthorized.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-idp-down/landing.js -> selenium/test/oauth/with-idp-down/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-idp-initiated-via-proxy/happy-login.js -> selenium/test/oauth/with-idp-initiated-via-proxy/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-idp-initiated/happy-login.js -> selenium/test/oauth/with-idp-initiated/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-idp-initiated/landing.js -> selenium/test/oauth/with-idp-initiated/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-idp-initiated/logout.js -> selenium/test/oauth/with-idp-initiated/logout.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-idp-initiated/token-expires.js -> selenium/test/oauth/with-idp-initiated/token-expires.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-idp-initiated/unauthorized.js -> selenium/test/oauth/with-idp-initiated/unauthorized.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-multi-resources/happy-login.js -> selenium/test/oauth/with-multi-resources/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-multi-resources/landing.js -> selenium/test/oauth/with-multi-resources/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/happy-login.js -> selenium/test/oauth/with-sp-initiated/happy-login.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/landing.js -> selenium/test/oauth/with-sp-initiated/landing.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/logout.js -> selenium/test/oauth/with-sp-initiated/logout.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/redirection-after-login.js -> selenium/test/oauth/with-sp-initiated/redirection-after-login.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/token-refresh.js -> selenium/test/oauth/with-sp-initiated/token-refresh.js
	renamed:    deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/unauthorized.js -> selenium/test/oauth/with-sp-initiated/unauthorized.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/AdminTab.js -> selenium/test/pageobjects/AdminTab.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/BasePage.js -> selenium/test/pageobjects/BasePage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/ExchangePage.js -> selenium/test/pageobjects/ExchangePage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/ExchangesPage.js -> selenium/test/pageobjects/ExchangesPage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/FakePortalPage.js -> selenium/test/pageobjects/FakePortalPage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/KeycloakLoginPage.js -> selenium/test/pageobjects/KeycloakLoginPage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/LimitsAdminTab.js -> selenium/test/pageobjects/LimitsAdminTab.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/LoginPage.js -> selenium/test/pageobjects/LoginPage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/OverviewPage.js -> selenium/test/pageobjects/OverviewPage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/SSOHomePage.js -> selenium/test/pageobjects/SSOHomePage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/UAALoginPage.js -> selenium/test/pageobjects/UAALoginPage.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/VhostAdminTab.js -> selenium/test/pageobjects/VhostAdminTab.js
	renamed:    deps/rabbitmq_management/selenium/test/pageobjects/VhostsAdminTab.js -> selenium/test/pageobjects/VhostsAdminTab.js
	renamed:    deps/rabbitmq_management/selenium/test/utils.js -> selenium/test/utils.js
	renamed:    deps/rabbitmq_management/selenium/test/vhosts/admin-vhosts.js -> selenium/test/vhosts/admin-vhosts.js

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/test-management-ui.yaml
	both modified:   selenium/bin/components/rabbitmq
	deleted by us:   selenium/bin/rabbit-compose.yml
	deleted by us:   selenium/test/authnz-msg-protocols/rabbitmq.cluster.conf
	deleted by us:   selenium/test/basic-auth/rabbitmq.cluster.conf
	deleted by us:   selenium/test/env.cluster
	deleted by us:   selenium/test/multi-oauth/rabbitmq.cluster.conf
	deleted by us:   selenium/test/oauth/rabbitmq.cluster.conf
	added by us:     selenium/test/vhosts/Makefile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the make label Sep 4, 2024
(cherry picked from commit a1206dc)

# Conflicts:
#	.github/workflows/test-management-ui.yaml
#	selenium/bin/components/rabbitmq
#	selenium/bin/rabbit-compose.yml
#	selenium/test/authnz-msg-protocols/rabbitmq.cluster.conf
#	selenium/test/basic-auth/rabbitmq.cluster.conf
#	selenium/test/env.cluster
#	selenium/test/multi-oauth/rabbitmq.cluster.conf
#	selenium/test/oauth/rabbitmq.cluster.conf
#	selenium/test/vhosts/Makefile
(cherry picked from commit 94f7540)
@MarcialRosales MarcialRosales force-pushed the mergify/bp/v4.0.x/pr-12198 branch from a45683b to f5c51d9 Compare September 4, 2024 16:21
@MarcialRosales MarcialRosales merged commit 268804c into v4.0.x Sep 4, 2024
199 checks passed
@MarcialRosales MarcialRosales deleted the mergify/bp/v4.0.x/pr-12198 branch September 4, 2024 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant