[21226] Improve CI workflows in master, and branching model refactor #365

JesusPoderoso · 2024-07-01T07:13:06Z

Description

This PR improves the CI workflows, making them as similar as possible to the Fast DDS workflows.
It also introduces a braching model refactor, similiar as the performed in Fast DDS repository.

Note: While backporting this PR, please ensure the following changes:

Remove nightly jobs
Update ubuntu-ci.yml file with the proper fallback branches
Change fastdds.repos to fastrtps.repos
3.3.x and 3.2.x requires both 1.1.x and 2.x Fast CDR branches to be tested
2.5.x requires only jdk11
2.1.x requires building on ubuntu-20.04, and only jdk11

@Mergifyio backport 3.3.x 3.2.x 2.5.x 2.1.x

Contributor Checklist

Commit messages follow the project guidelines.
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 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.

…ing model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

RELEASE_SUPPORT.md

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

richiware · 2024-07-02T07:27:44Z

LGTM ✅

JesusPoderoso · 2024-07-02T08:07:30Z

@Mergifyio backport 3.3.x 3.2.x 2.5.x 2.1.x

mergify · 2024-07-02T08:07:43Z

backport 3.3.x 3.2.x 2.5.x 2.1.x

✅ Backports have been created

#366 [21226] Improve CI workflows in master, and branching model refactor (backport #365) has been created for branch 3.3.x but encountered conflicts
#367 [21226] Improve CI workflows in master, and branching model refactor (backport #365) has been created for branch 3.2.x but encountered conflicts
#368 [21226] Improve CI workflows in master, and branching model refactor (backport #365) has been created for branch 2.5.x but encountered conflicts
#369 [21226] Improve CI workflows in master, and branching model refactor (backport #365) has been created for branch 2.1.x but encountered conflicts

* Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11) # Conflicts: # .github/actions/fetch-fastddsgen-repos/action.yml # .github/workflows/reusable-ubuntu-ci.yaml # .github/workflows/ubuntu-ci.yaml

* Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11) # Conflicts: # .github/actions/fetch-fastddsgen-repos/action.yml # .github/workflows/config/build.meta

* Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11) # Conflicts: # .github/actions/fetch-fastddsgen-repos/action.yml

* Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11) # Conflicts: # .github/workflows/config/build.meta

* Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11)

) * Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11) Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>

…365) (#366) * Improve CI workflows in master, and branching model refactor (#365) * Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11) * Refs #21226: TODO DROP: Test against Discovery Server 1.2.x Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21286: Fix CDR version in tests Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add blacklist tests for CDR 1.1.x Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com> Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>

) * Improve CI workflows in master, and branching model refactor (#365) * Refs #21226: Improve CI workflows in master and apply Fast DDS branching model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add RELEASE_SUPPORT.md file Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Add suggested changes from previous / similar PRs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21226: Apply rev suggestion Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit d912d11) * Refs #21226: Add option in actions Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com> Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>

JesusPoderoso added this to the v4.0.0 milestone Jul 1, 2024

JesusPoderoso self-assigned this Jul 1, 2024

JesusPoderoso changed the title ~~[21226] Improve CI workflows in main, and branching model refactor~~ [21226] Improve CI workflows in master, and branching model refactor Jul 1, 2024

JesusPoderoso requested a review from richiprosima July 1, 2024 07:13

github-actions bot added the ci-pending PR which CI is running label Jul 1, 2024

JesusPoderoso changed the base branch from master to feature/21222 July 1, 2024 07:13

JesusPoderoso force-pushed the feature/21226 branch from de45d4d to 0fb614c Compare July 1, 2024 07:18

JesusPoderoso requested review from richiprosima and removed request for richiprosima July 1, 2024 07:18

JesusPoderoso force-pushed the feature/21226 branch from 0fb614c to 816f6d2 Compare July 1, 2024 07:21

JesusPoderoso requested review from richiprosima and removed request for richiprosima July 1, 2024 07:21

Refs #21226: Improve CI workflows in master and apply Fast DDS branch…

30878ce

…ing model Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

JesusPoderoso force-pushed the feature/21226 branch from 816f6d2 to 30878ce Compare July 1, 2024 07:28

JesusPoderoso requested review from richiprosima and removed request for richiprosima July 1, 2024 07:28

JesusPoderoso added 2 commits July 1, 2024 15:15

Refs #21226: Add RELEASE_SUPPORT.md file

b7954ee

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

Refs #21226: Add suggested changes from previous / similar PRs

885f074

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

JesusPoderoso requested review from richiware and removed request for richiprosima July 1, 2024 13:17

richiware requested changes Jul 2, 2024

View reviewed changes

RELEASE_SUPPORT.md Outdated Show resolved Hide resolved

Refs #21226: Apply rev suggestion

7c2ee05

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

JesusPoderoso requested a review from richiware July 2, 2024 07:11

richiware approved these changes Jul 2, 2024

View reviewed changes

JesusPoderoso merged commit d912d11 into feature/21222 Jul 2, 2024
4 checks passed

JesusPoderoso deleted the feature/21226 branch July 2, 2024 08:32

mergify bot mentioned this pull request Jul 2, 2024

[21226] Improve CI workflows in 2.1.x, and branching model refactor (backport #365) #369

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[21226] Improve CI workflows in master, and branching model refactor #365

[21226] Improve CI workflows in master, and branching model refactor #365

JesusPoderoso commented Jul 1, 2024 •

edited by richiware

Loading

richiware commented Jul 2, 2024

JesusPoderoso commented Jul 2, 2024

mergify bot commented Jul 2, 2024 •

edited

Loading

[21226] Improve CI workflows in master, and branching model refactor #365

[21226] Improve CI workflows in master, and branching model refactor #365

Conversation

JesusPoderoso commented Jul 1, 2024 • edited by richiware Loading

Description

Contributor Checklist

Reviewer Checklist

richiware commented Jul 2, 2024

JesusPoderoso commented Jul 2, 2024

mergify bot commented Jul 2, 2024 • edited Loading

✅ Backports have been created

JesusPoderoso commented Jul 1, 2024 •

edited by richiware

Loading

mergify bot commented Jul 2, 2024 •

edited

Loading