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

[21886] Feature: Windows ci example testing (backport #5397) #5425

Merged
merged 2 commits into from
Dec 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 27, 2024

Description

This PR introduces example testing in windows (for the moment, just the hello_world_example) by

  • Refactoring the current ci example testing so that the docker composes can be used for Linux and Windows.
  • Creating a new cmake target in which the windows testing image is created with the provided Dockerfile
  • It also adds a new cli argument to the hello_world example matched so the publisher does not start publishing until it has discovered a minimum of participants.

Follow up work

  • Include the rest of the examples in the testing.
  • Maybe separate the windows ci in two jobs: one for building the core library and the other one for testing

@Mergifyio backport 3.1.x 3.0.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • 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.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • 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.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #5397 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 27, 2024
Copy link
Contributor Author

mergify bot commented Nov 27, 2024

Cherry-pick of 9c9078f has failed:

On branch mergify/bp/3.1.x/pr-5397
Your branch is up to date with 'origin/3.1.x'.

You are currently cherry-picking commit 9c9078ff8.
  (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:   examples/cpp/hello_world/CLIParser.hpp
	modified:   examples/cpp/hello_world/PublisherApp.cpp
	modified:   examples/cpp/hello_world/PublisherApp.hpp
	modified:   test/examples/CMakeLists.txt
	modified:   test/examples/configuration.compose.yml
	modified:   test/examples/content_filter.compose.yml
	modified:   test/examples/custom_payload_pool.compose.yml
	modified:   test/examples/delivery_mechanisms.compose.yml
	modified:   test/examples/delivery_mechanisms_isolated.compose.yml
	modified:   test/examples/discovery_server.compose.yml
	modified:   test/examples/flow_control.compose.yml
	modified:   test/examples/hello_world.compose.yml
	modified:   test/examples/request_reply.compose.yml
	modified:   test/examples/request_reply_isolated.compose.yml
	modified:   test/examples/rtps.compose.yml
	modified:   test/examples/security.compose.yml
	modified:   test/examples/static_edp_discovery.compose.yml
	modified:   test/examples/test_hello_world.py
	modified:   test/examples/topic_instances.compose.yml
	new file:   test/examples/windows/Dockerfile
	modified:   test/examples/xtypes_complete.compose.yml
	modified:   test/examples/xtypes_minimal.compose.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/reusable-windows-ci.yml
	both modified:   versions.md

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 mentioned this pull request Nov 27, 2024
12 tasks
@Mario-DL Mario-DL added this to the v3.1.1 milestone Dec 13, 2024
Mario-DL and others added 2 commits December 13, 2024 09:31
* Refs #21886: Bump windows ci image to 2022

Signed-off-by: Mario-DL <[email protected]>

* Refs #21886: Add FASTDDS_EXAMPLE_TESTS=ON for windows ci tests

Signed-off-by: Mario-DL <[email protected]>

* Refs #21886: Add matched argument to hello_world example

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21886: Add Windows testing Dockerfile

Signed-off-by: Mario-DL <[email protected]>

* Refs #21886: Refactor CMakeLists example tests and hello_world compose

Signed-off-by: Mario-DL <[email protected]>

* Refs #21886: test_hello_world.py fix

Signed-off-by: Mario-DL <[email protected]>

* Refs #21886: Update docker compose file structure of the rest of examples

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21886: versions.md

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario-DL <[email protected]>
Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 9c9078f)
Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL Mario-DL force-pushed the mergify/bp/3.1.x/pr-5397 branch from c02ade7 to 00ea3db Compare December 13, 2024 08:32
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL December 13, 2024 08:33
@Mario-DL Mario-DL removed the conflicts Backport PR wich git cherry pick failed label Dec 13, 2024
@Mario-DL Mario-DL self-requested a review December 13, 2024 08:33
@github-actions github-actions bot added the ci-pending PR which CI is running label Dec 13, 2024
@MiguelCompany MiguelCompany merged commit e16f87d into 3.1.x Dec 16, 2024
21 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.1.x/pr-5397 branch December 16, 2024 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants