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

Add CI jobs for garden branches #787

Merged
merged 14 commits into from
Aug 12, 2022
Merged

Add CI jobs for garden branches #787

merged 14 commits into from
Aug 12, 2022

Conversation

scpeters
Copy link
Contributor

This renames the supported_branches method in ignition.dsl to supported_ign_branches (eab7c8e) and adds a parallel supported_gz_branches method that draws from a gz_branches data structure (9ab203a). It also adds the sdf13 branch in sdformat.dsl (558d0e6).

The code duplication could potentially be reduced with some refactoring, but I think this is the easiest way to get CI working for our garden branches.

Rename supported_branches to supported_ign_branches
in preparation for supported_gz_branches.

Signed-off-by: Steve Peters <[email protected]>
Add separate logic for gz-* branches.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from chapulina August 10, 2022 01:24
@scpeters scpeters requested a review from j-rivero as a code owner August 10, 2022 01:24
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for getting this going! CC @j-rivero who was assigned to this task.

jenkins-scripts/dsl/ignition.dsl Outdated Show resolved Hide resolved
supported_gz_branches("${gz_software}").each { major_version ->
if (major_version) {
// No 1-debbuild versions, they use the unversioned job
if ("${major_version}" == "0" || "${major_version}" == "1" )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have any libraries in this situation, but I imagine it could happen in the future if we add a new library

jenkins-scripts/dsl/ignition.dsl Show resolved Hide resolved
jenkins-scripts/dsl/sdformat.dsl Outdated Show resolved Hide resolved
scpeters and others added 3 commits August 10, 2022 14:26
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to run a test build

jenkins-scripts/dsl/ignition.dsl Outdated Show resolved Hide resolved
@scpeters
Copy link
Contributor Author

testing for sdformat:

Added items:
    GeneratedJob{name='sdformat-ci-sdformat13-focal-amd64'}
    GeneratedJob{name='sdformat-ci_asan-sdformat13-focal-amd64'}
    GeneratedJob{name='sdformat-install-sdformat13_pkg-focal-amd64'}
    GeneratedJob{name='sdformat-ci-sdformat13-homebrew-amd64'}
    GeneratedJob{name='sdformat13-install_bottle-homebrew-amd64'}
    GeneratedJob{name='sdformat-ci-sdformat13-windows7-amd64'}

@scpeters
Copy link
Contributor Author

testing for sdformat:

Added items:
    GeneratedJob{name='sdformat-ci-sdformat13-focal-amd64'}
    GeneratedJob{name='sdformat-ci_asan-sdformat13-focal-amd64'}
    GeneratedJob{name='sdformat-install-sdformat13_pkg-focal-amd64'}
    GeneratedJob{name='sdformat-ci-sdformat13-homebrew-amd64'}
    GeneratedJob{name='sdformat13-install_bottle-homebrew-amd64'}
    GeneratedJob{name='sdformat-ci-sdformat13-windows7-amd64'}

the ABI checker job is now triggering for sdf13 in gazebosim/sdformat#1106

@scpeters
Copy link
Contributor Author

@j-rivero @chapulina would you like to see further testing of this? I've tested the sdformat changes, and could deploy the ignition changes as well if you'd like to see that tested before merging

@chapulina
Copy link
Contributor

could deploy the ignition changes as well if you'd like to see that tested before merging

Yeah I was hoping to trigger one of those since the ignition DSL is separate from SDF

@scpeters
Copy link
Contributor Author

deploying:

Added items:
    GeneratedJob{name='ignition_cmake-ci-gz-cmake3-focal-amd64'}
    GeneratedJob{name='ignition_cmake-ci_asan-gz-cmake3-focal-amd64'}
    GeneratedJob{name='ignition_common-ci-gz-common5-focal-amd64'}
    GeneratedJob{name='ignition_common-ci_asan-gz-common5-focal-amd64'}
    GeneratedJob{name='ignition_fuel-tools-ci-gz-fuel-tools8-focal-amd64'}
    GeneratedJob{name='ignition_fuel-tools-ci_asan-gz-fuel-tools8-focal-amd64'}
    GeneratedJob{name='ignition_gui-ci-gz-gui7-focal-amd64'}
    GeneratedJob{name='ignition_gui-ci_asan-gz-gui7-focal-amd64'}
    GeneratedJob{name='ignition_launch-ci-gz-launch6-focal-amd64'}
    GeneratedJob{name='ignition_launch-ci_asan-gz-launch6-focal-amd64'}
    GeneratedJob{name='ignition_math-ci-gz-math7-focal-amd64'}
    GeneratedJob{name='ignition_math-ci_asan-gz-math7-focal-amd64'}
    GeneratedJob{name='ignition_msgs-ci-gz-msgs9-focal-amd64'}
    GeneratedJob{name='ignition_msgs-ci_asan-gz-msgs9-focal-amd64'}
    GeneratedJob{name='ignition_physics-ci-gz-physics6-focal-amd64'}
    GeneratedJob{name='ignition_physics-ci_asan-gz-physics6-focal-amd64'}
    GeneratedJob{name='ignition_plugin-ci-gz-plugin2-focal-amd64'}
    GeneratedJob{name='ignition_plugin-ci_asan-gz-plugin2-focal-amd64'}
    GeneratedJob{name='ignition_rendering-ci-gz-rendering7-focal-amd64'}
    GeneratedJob{name='ignition_rendering-ci_asan-gz-rendering7-focal-amd64'}
    GeneratedJob{name='ignition_sensors-ci-gz-sensors7-focal-amd64'}
    GeneratedJob{name='ignition_sensors-ci_asan-gz-sensors7-focal-amd64'}
    GeneratedJob{name='ignition_tools-ci-gz-tools2-focal-amd64'}
    GeneratedJob{name='ignition_tools-ci_asan-gz-tools2-focal-amd64'}
    GeneratedJob{name='ignition_transport-ci-gz-transport12-focal-amd64'}
    GeneratedJob{name='ignition_transport-ci_asan-gz-transport12-focal-amd64'}
    GeneratedJob{name='ignition_utils-ci-gz-utils2-focal-amd64'}
    GeneratedJob{name='ignition_utils-ci_asan-gz-utils2-focal-amd64'}
    GeneratedJob{name='gz-cmake3-debbuilder'}
    GeneratedJob{name='gz-common5-debbuilder'}
    GeneratedJob{name='gz-fuel-tools8-debbuilder'}
    GeneratedJob{name='gz-gui7-debbuilder'}
    GeneratedJob{name='gz-launch6-debbuilder'}
    GeneratedJob{name='gz-math7-debbuilder'}
    GeneratedJob{name='gz-msgs9-debbuilder'}
    GeneratedJob{name='gz-physics6-debbuilder'}
    GeneratedJob{name='gz-plugin2-debbuilder'}
    GeneratedJob{name='gz-rendering7-debbuilder'}
    GeneratedJob{name='gz-sensors7-debbuilder'}
    GeneratedJob{name='gz-tools2-debbuilder'}
    GeneratedJob{name='gz-transport12-debbuilder'}
    GeneratedJob{name='gz-utils2-debbuilder'}
    GeneratedJob{name='ignition_cmake-ci-gz-cmake3-homebrew-amd64'}
    GeneratedJob{name='ignition_common-ci-gz-common5-homebrew-amd64'}
    GeneratedJob{name='ignition_fuel-tools-ci-gz-fuel-tools8-homebrew-amd64'}
    GeneratedJob{name='ignition_gui-ci-gz-gui7-homebrew-amd64'}
    GeneratedJob{name='ignition_launch-ci-gz-launch6-homebrew-amd64'}
    GeneratedJob{name='ignition_math-ci-gz-math7-homebrew-amd64'}
    GeneratedJob{name='ignition_msgs-ci-gz-msgs9-homebrew-amd64'}
    GeneratedJob{name='ignition_physics-ci-gz-physics6-homebrew-amd64'}
    GeneratedJob{name='ignition_plugin-ci-gz-plugin2-homebrew-amd64'}
    GeneratedJob{name='ignition_rendering-ci-gz-rendering7-homebrew-amd64'}
    GeneratedJob{name='ignition_sensors-ci-gz-sensors7-homebrew-amd64'}
    GeneratedJob{name='ignition_tools-ci-gz-tools2-homebrew-amd64'}
    GeneratedJob{name='ignition_transport-ci-gz-transport12-homebrew-amd64'}
    GeneratedJob{name='ignition_utils-ci-gz-utils2-homebrew-amd64'}
    GeneratedJob{name='ignition_cmake-ci-gz-cmake3-windows7-amd64'}
    GeneratedJob{name='ign_common-gz-5-win'}
    GeneratedJob{name='ign_fuel-tools-gz-8-win'}
    GeneratedJob{name='ign_gui-gz-7-win'}
    GeneratedJob{name='ign_launch-gz-6-win'}
    GeneratedJob{name='ign_math-gz-7-win'}
    GeneratedJob{name='ign_msgs-gz-9-win'}
    GeneratedJob{name='ign_physics-gz-6-win'}
    GeneratedJob{name='ign_plugin-gz-2-win'}
    GeneratedJob{name='ign_rendering-gz-7-win'}
    GeneratedJob{name='ign_sensors-gz-7-win'}
    GeneratedJob{name='ign_tools-gz-2-win'}
    GeneratedJob{name='ign_transport-gz-12-win'}
    GeneratedJob{name='ign_utils-gz-2-win'}

it looks like this creates duplicate deb builder jobs:

I'll redact the duplication for now so we can fix it later

@chapulina
Copy link
Contributor

I'll redact the duplication for now so we can fix it later

Are you removing the gz ones or the ignition?

@chapulina
Copy link
Contributor

For the CI jobs, will the ignition or gz ones be triggered for each stable branch? We'll need to update badges and branch projection requirements for all libraries.

Signed-off-by: Steve Peters <[email protected]>
Remove garden jobs from extra_debbuild array.

Signed-off-by: Steve Peters <[email protected]>
@scpeters
Copy link
Contributor Author

I'll redact the duplication for now so we can fix it later

Are you removing the gz ones or the ignition?

I'm removing the gz ones for now in 2801fb1

@scpeters
Copy link
Contributor Author

For the CI jobs, will the ignition or gz ones be triggered for each stable branch? We'll need to update badges and branch projection requirements for all libraries.

all the jenkins job names should still start with ign for now

Signed-off-by: Steve Peters <[email protected]>
@scpeters
Copy link
Contributor Author

new test:

but it's missing some gz-sim jobs, so I've made another change in 8c84a3c

@scpeters
Copy link
Contributor Author

but it's missing some gz-sim jobs, so I've made another change in 8c84a3c

that didn't do what I intended; I think I'll revert it

https://build.osrfoundation.org/job/_dsl_ignition/1362/console

Added items:
    GeneratedJob{name='ignition_sim-abichecker-any_to_any-ubuntu_auto-amd64'}
    GeneratedJob{name='ignition_sim-ci-pr_any-ubuntu_auto-amd64'}
    GeneratedJob{name='ignition_sim-install-pkg-focal-amd64'}
    GeneratedJob{name='ignition_sim-ci-gz-sim7-focal-amd64'}
    GeneratedJob{name='ignition_sim-ci_asan-gz-sim7-focal-amd64'}
    GeneratedJob{name='ignition_sim-ci-main-focal-amd64'}
    GeneratedJob{name='ignition_sim-ci_asan-main-focal-amd64'}
    GeneratedJob{name='ign-sim7-debbuilder'}
    GeneratedJob{name='ignition_sim-ci-pr_any-homebrew-amd64'}
    GeneratedJob{name='ignition_sim-ci-gz-sim7-homebrew-amd64'}
    GeneratedJob{name='ignition_sim-ci-main-homebrew-amd64'}
    GeneratedJob{name='ignition_sim-install_bottle-homebrew-amd64'}
    GeneratedJob{name='ign_sim-pr-win'}
    GeneratedJob{name='ign_sim-gz-7-win'}
    GeneratedJob{name='ign_sim-ci-win'}
    GeneratedJob{name='ignition_sim-ci-manual_any'}

This reverts commit 8c84a3c.

Signed-off-by: Steve Peters <[email protected]>
@scpeters
Copy link
Contributor Author

fresh deployment: Build Status https://build.osrfoundation.org/job/_dsl_ignition/1366/

Added items:
    GeneratedJob{name='ignition_cmake-ci-gz-cmake3-focal-amd64'}
    GeneratedJob{name='ignition_cmake-ci_asan-gz-cmake3-focal-amd64'}
    GeneratedJob{name='ignition_common-ci-gz-common5-focal-amd64'}
    GeneratedJob{name='ignition_common-ci_asan-gz-common5-focal-amd64'}
    GeneratedJob{name='ignition_fuel-tools-ci-gz-fuel-tools8-focal-amd64'}
    GeneratedJob{name='ignition_fuel-tools-ci_asan-gz-fuel-tools8-focal-amd64'}
    GeneratedJob{name='ignition_gui-ci-gz-gui7-focal-amd64'}
    GeneratedJob{name='ignition_gui-ci_asan-gz-gui7-focal-amd64'}
    GeneratedJob{name='ignition_launch-ci-gz-launch6-focal-amd64'}
    GeneratedJob{name='ignition_launch-ci_asan-gz-launch6-focal-amd64'}
    GeneratedJob{name='ignition_math-ci-gz-math7-focal-amd64'}
    GeneratedJob{name='ignition_math-ci_asan-gz-math7-focal-amd64'}
    GeneratedJob{name='ignition_msgs-ci-gz-msgs9-focal-amd64'}
    GeneratedJob{name='ignition_msgs-ci_asan-gz-msgs9-focal-amd64'}
    GeneratedJob{name='ignition_physics-ci-gz-physics6-focal-amd64'}
    GeneratedJob{name='ignition_physics-ci_asan-gz-physics6-focal-amd64'}
    GeneratedJob{name='ignition_plugin-ci-gz-plugin2-focal-amd64'}
    GeneratedJob{name='ignition_plugin-ci_asan-gz-plugin2-focal-amd64'}
    GeneratedJob{name='ignition_rendering-ci-gz-rendering7-focal-amd64'}
    GeneratedJob{name='ignition_rendering-ci_asan-gz-rendering7-focal-amd64'}
    GeneratedJob{name='ignition_sensors-ci-gz-sensors7-focal-amd64'}
    GeneratedJob{name='ignition_sensors-ci_asan-gz-sensors7-focal-amd64'}
    GeneratedJob{name='ignition_tools-ci-gz-tools2-focal-amd64'}
    GeneratedJob{name='ignition_tools-ci_asan-gz-tools2-focal-amd64'}
    GeneratedJob{name='ignition_transport-ci-gz-transport12-focal-amd64'}
    GeneratedJob{name='ignition_transport-ci_asan-gz-transport12-focal-amd64'}
    GeneratedJob{name='ignition_utils-ci-gz-utils2-focal-amd64'}
    GeneratedJob{name='ignition_utils-ci_asan-gz-utils2-focal-amd64'}
    GeneratedJob{name='ignition_cmake-ci-gz-cmake3-homebrew-amd64'}
    GeneratedJob{name='ignition_common-ci-gz-common5-homebrew-amd64'}
    GeneratedJob{name='ignition_fuel-tools-ci-gz-fuel-tools8-homebrew-amd64'}
    GeneratedJob{name='ignition_gui-ci-gz-gui7-homebrew-amd64'}
    GeneratedJob{name='ignition_launch-ci-gz-launch6-homebrew-amd64'}
    GeneratedJob{name='ignition_math-ci-gz-math7-homebrew-amd64'}
    GeneratedJob{name='ignition_msgs-ci-gz-msgs9-homebrew-amd64'}
    GeneratedJob{name='ignition_physics-ci-gz-physics6-homebrew-amd64'}
    GeneratedJob{name='ignition_plugin-ci-gz-plugin2-homebrew-amd64'}
    GeneratedJob{name='ignition_rendering-ci-gz-rendering7-homebrew-amd64'}
    GeneratedJob{name='ignition_sensors-ci-gz-sensors7-homebrew-amd64'}
    GeneratedJob{name='ignition_tools-ci-gz-tools2-homebrew-amd64'}
    GeneratedJob{name='ignition_transport-ci-gz-transport12-homebrew-amd64'}
    GeneratedJob{name='ignition_utils-ci-gz-utils2-homebrew-amd64'}
    GeneratedJob{name='ignition_cmake-ci-gz-cmake3-windows7-amd64'}
    GeneratedJob{name='ign_common-gz-5-win'}
    GeneratedJob{name='ign_fuel-tools-gz-8-win'}
    GeneratedJob{name='ign_gui-gz-7-win'}
    GeneratedJob{name='ign_launch-gz-6-win'}
    GeneratedJob{name='ign_math-gz-7-win'}
    GeneratedJob{name='ign_msgs-gz-9-win'}
    GeneratedJob{name='ign_physics-gz-6-win'}
    GeneratedJob{name='ign_plugin-gz-2-win'}
    GeneratedJob{name='ign_rendering-gz-7-win'}
    GeneratedJob{name='ign_sensors-gz-7-win'}
    GeneratedJob{name='ign_tools-gz-2-win'}
    GeneratedJob{name='ign_transport-gz-12-win'}
    GeneratedJob{name='ign_utils-gz-2-win'}

all existing jobs are preserved, but the gz-sim7 are not yet added

@scpeters
Copy link
Contributor Author

ABI job is now triggering properly in gazebosim/gz-math#481

@scpeters scpeters merged commit b81cdf7 into master Aug 12, 2022
@scpeters scpeters deleted the scpeters/gz_branches branch August 12, 2022 00:13
@azeey azeey mentioned this pull request Jul 28, 2023
82 tasks
@azeey azeey mentioned this pull request Dec 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants