Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented May 3, 2025

Proposed Changes

This change allows a Selenium suite to work with two nodes, the main one, and other. This is necessary to test WSR feature but it can also be used for federation and shovel. Note that this is not a cluster of two nodes, which are explicitly recommended against, but rather two independent nodes (single node clusters) used for integration testing.

When running a test suite in interactive mode with two rabbitmqs, we start the main rabbitmq with the command start-rabbitmq and the other with start-other-rabbitmq. Moreover, one has to defined OTHER_PROFILE variable for the other rabbitmq. And the infrastructure generates the corresponding rabbitmq configuration from the active profiles the same way it is done for the main rabbitmq.

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

Checklist

Put an x in the boxes that apply.
You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING.md document
  • I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
  • I have added tests that prove my fix is effective or that my feature works
  • All tests pass locally with my changes
  • If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
  • If relevant, I have added this change to the first version(s) in release-notes that I expect to introduce it

Further Comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution
you did and what alternatives you considered, etc.


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

(cherry picked from commit 64f7aa2)
(cherry picked from commit fa315e4)
it was necessary to add a queue first before checking which
columns are available

(cherry picked from commit 7653b65)

# Conflicts:
#	selenium/test/queuesAndStreams/list.js
@mergify
Copy link
Author

mergify bot commented May 3, 2025

Cherry-pick of 7653b65 has failed:

On branch mergify/bp/v4.1.x/pr-13843
Your branch is ahead of 'origin/v4.1.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7653b6522.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   selenium/test/queuesAndStreams/list.js

no changes added to commit (use "git add" and/or "git commit -a")

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

@michaelklishin michaelklishin merged commit 4703c1c into v4.1.x May 3, 2025
273 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.1.x/pr-13843 branch May 3, 2025 15:53
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.

3 participants