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

[20652] Improve filtering of DNS tests (backport #4603) #4619

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 26, 2024

Description

When both PKCS#11 and DNS tests had to be disabled, the filter expression for gtest was incorrectly generated.
This made Ubuntu and MacOS CI on github fail.

Additionally, this PR fixes the commands used to detect whether the DNS local entries for the corresponding tests have been added, and adds some related informational messages to the CMake files.

@Mergifyio backport 2.13.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • Changes are ABI compatible.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

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

* Refs #20652. Fix windows command to check local DNS name.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Correctly combine blackbox filters.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Informational message on participant test.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Use correct command on Apple to check local DNS name.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Use filter on RTPS blackbox tests.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Fix typo.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Fix filter in LocatorTests.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Filter with grep in mac.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Fix concurrency group in ubuntu-ci.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 1d9d559)
@mergify mergify bot mentioned this pull request Mar 26, 2024
9 tasks
@JesusPoderoso JesusPoderoso added this to the v2.13.4 milestone Mar 26, 2024
@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Mar 26, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

CI issues unrelated to the PR.
Ready to Merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Mar 27, 2024
@EduPonz EduPonz merged commit 1795078 into 2.13.x Mar 28, 2024
12 of 15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4603 branch March 28, 2024 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants