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.

Sign up for GitHub

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

Jump to bottom

Stable branches for Edifice #422

Merged
merged 5 commits into from
Apr 6, 2021
Merged

Stable branches for Edifice #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95a19a2
Stable branches for Edifice
chapulina Mar 30, 2021
86e47d3
Merge branch 'master' into chapulina/edifice_stable
scpeters Apr 1, 2021
ae90866
sdformat.dsl: add sdf11 branch
scpeters Apr 1, 2021
b912963
nightlies
chapulina Apr 1, 2021
dceb80c
Merge branch 'chapulina/edifice_stable' of ssh://github.com/ignition-…
chapulina Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions jenkins-scripts/dsl/ignition.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ ignition_no_test = [ 'tools' ]
// No branches in ignition_branches means no released branches (only CI on
// main, ABI check, install pkg)
ignition_branches = [ 'cmake' : [ '2' ],
'common' : [ '1', '3' ],
'fuel-tools' : [ '1', '4', '5' ],
'gazebo' : [ '3', '4' ],
'gui' : [ '0', '3', '4' ],
'launch' : [ '2', '3' ],
'common' : [ '1', '3', '4' ],
'fuel-tools' : [ '1', '4', '5', '6' ],
'gazebo' : [ '3', '4', '5' ],
'gui' : [ '0', '3', '4', '5' ],
'launch' : [ '2', '3', '4' ],
'math' : [ '2', '4', '6' ],
'msgs' : [ '1', '5', '6' ],
'physics' : [ '2', '3' ],
'msgs' : [ '1', '5', '6', '7' ],
'physics' : [ '2', '3', '4' ],
'plugin' : [ '1' ],
'rendering' : [ '3', '4' ],
'sensors' : [ '3', '4' ],
'rendering' : [ '3', '4', '5' ],
'sensors' : [ '3', '4', '5' ],
'tools' : [ '1' ],
'transport' : [ '4', '8', '9' ],
'utils' : [ ]]
'transport' : [ '4', '8', '9', '10' ],
'utils' : [ '1' ]]
// DESC: prerelease branches are managed as any other supported branches for
// special cases different to major branches: get compilation CI on the branch
// physics/sensors don't need to be included since they use main for gz11
Expand All @@ -51,20 +51,20 @@ ignition_prerelease_branches = []
// don't appear in ignition_branches (like nightly builders or 0-debbuild
// jobs for the special cases of foo0 packages)
ignition_extra_debbuild = [ 'cmake3',
'common4',
'fuel-tools6',
'gazebo5',
'gui5',
'launch4',
'common5',
'fuel-tools7',
'gazebo6',
'gui6',
'launch5',
'math7',
'msgs7',
'physics4',
'msgs8',
'physics5',
'plugin2',
'rendering5',
'sensors5',
'rendering6',
'sensors6',
'tools2',
'transport10',
'utils1']
'transport11',
'utils2']
// DESC: exclude ignition from generate any install testing job
ignition_no_pkg_yet = [ ]
// DESC: major versions that has a package in the prerelease repo. Should
Expand Down Expand Up @@ -462,6 +462,7 @@ ignition_software.each { ign_sw ->
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs4") ||
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs5") ||
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs6") ||
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs7") ||
("${ign_sw}" == "msgs" && "${branch}" == "main") ||
("${ign_sw}" == "physics") ||
("${ign_sw}" == "plugin" && "${branch}" != "ign-plugin0") ||
Expand All @@ -472,6 +473,7 @@ ignition_software.each { ign_sw ->
("${ign_sw}" == "transport" && "${branch}" == "ign-transport7") ||
("${ign_sw}" == "transport" && "${branch}" == "ign-transport8") ||
("${ign_sw}" == "transport" && "${branch}" == "ign-transport9") ||
("${ign_sw}" == "transport" && "${branch}" == "ign-transport10") ||
("${ign_sw}" == "transport" && "${branch}" == "main") ||
("${ign_sw}" == "utils")))
disabled()
Expand Down
184 changes: 134 additions & 50 deletions jenkins-scripts/dsl/ignition_collection.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import javaposse.jobdsl.dsl.Job
// IGNITION COLLECTIONS
arch = 'amd64'

ignition_nightly = 'edifice'
ignition_nightly = 'fortress'

ignition_collections = [
[ name : 'citadel',
Expand All @@ -15,25 +15,28 @@ ignition_collections = [
],
[ name : 'edifice',
distros : [ 'focal' ],
],
[ name : 'fortress',
distros : [ 'focal' ],
// Note that not all main branches will go into the next collection
nightly_jobs: [
'cmake' : [ debbuild: 'ign-cmake3' , branch: 'main' ],
'common' : [ debbuild: 'ign-common4' , branch: 'main' ],
'edifice' : [ debbuild: 'ign-edifice' , branch: 'main' ],
'fuel-tools': [ debbuild: 'ign-fuel-tools6' , branch: 'main' ],
'gazebo' : [ debbuild: 'ign-gazebo5' , branch: 'main' ],
'gui' : [ debbuild: 'ign-gui5' , branch: 'main' ],
'launch' : [ debbuild: 'ign-launch4' , branch: 'main' ],
'common' : [ debbuild: 'ign-common5' , branch: 'main' ],
'fortress' : [ debbuild: 'ign-fortress' , branch: 'main' ],
'fuel-tools': [ debbuild: 'ign-fuel-tools7' , branch: 'main' ],
'gazebo' : [ debbuild: 'ign-gazebo6' , branch: 'main' ],
'gui' : [ debbuild: 'ign-gui6' , branch: 'main' ],
'launch' : [ debbuild: 'ign-launch5' , branch: 'main' ],
'math' : [ debbuild: 'ign-math7' , branch: 'main' ],
'msgs' : [ debbuild: 'ign-msgs7' , branch: 'main' ],
'physics' : [ debbuild: 'ign-physics4' , branch: 'main' ],
'msgs' : [ debbuild: 'ign-msgs8' , branch: 'main' ],
'physics' : [ debbuild: 'ign-physics5' , branch: 'main' ],
'plugin' : [ debbuild: 'ign-plugin2' , branch: 'main' ],
'rendering' : [ debbuild: 'ign-rendering5' , branch: 'main' ],
'sdformat' : [ debbuild: 'sdformat11' , branch: 'main' ],
'sensors' : [ debbuild: 'ign-sensors5' , branch: 'main' ],
'rendering' : [ debbuild: 'ign-rendering6' , branch: 'main' ],
'sdformat' : [ debbuild: 'sdformat12' , branch: 'main' ],
'sensors' : [ debbuild: 'ign-sensors6' , branch: 'main' ],
'tools' : [ debbuild: 'ign-tools2' , branch: 'main' ],
'transport' : [ debbuild: 'ign-transport10' , branch: 'main' ],
'utils' : [ debbuild: 'ign-utils1' , branch: 'main' ],
'transport' : [ debbuild: 'ign-transport11' , branch: 'main' ],
'utils' : [ debbuild: 'ign-utils2' , branch: 'main' ],
],
],
]
Expand Down Expand Up @@ -197,12 +200,12 @@ ignition_collection_jobs =
'sdformat-install-sdformat10_pkg-bionic-amd64'
],
'edifice' : [
'ign_gazebo-ci-win',
'ign_gui-ci-win',
'ign_physics-ci-win',
'ign_rendering-ci-win',
'ign_sensors-ci-win',
'ign_utils-ci-win',
'ign_gazebo-ign-5-win',
'ign_gui-ign-5-win',
'ign_physics-ign-4-win',
'ign_rendering-ign-5-win',
'ign_sensors-ign-5-win',
'ign_utils-ign-1-win',
'ignition_edifice-ci-main-homebrew-amd64',
'ignition_edifice-install-pkg-bionic-amd64',
'ignition_edifice-install_bottle-homebrew-amd64',
Expand All @@ -211,70 +214,151 @@ ignition_collection_jobs =
'ignition_cmake-ci-ign-cmake2-windows7-amd64',
'ignition_cmake2-install-pkg-bionic-amd64',
'ignition_cmake2-install_bottle-homebrew-amd64',
'ignition_common-ci-ign-common3-bionic-amd64',
'ignition_common-ci-ign-common3-homebrew-amd64',
'ignition_common-ci-ign-common3-windows7-amd64',
'ignition_common3-install-pkg-bionic-amd64',
'ignition_common3-install_bottle-homebrew-amd64',
'ignition_fuel-tools-ci-main-bionic-amd64',
'ignition_fuel-tools-ci-main-homebrew-amd64',
'ignition_fuel-tools-ci-main-windows7-amd64',
'ignition_common-ci-ign-common4-bionic-amd64',
'ignition_common-ci-ign-common4-homebrew-amd64',
'ignition_common-ci-ign-common4-windows7-amd64',
'ignition_common4-install-pkg-bionic-amd64',
'ignition_common4-install_bottle-homebrew-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools6-bionic-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools6-homebrew-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools6-windows7-amd64',
'ignition_fuel-tools6-install-pkg-bionic-amd64',
'ignition_fuel-tools6-install_bottle-homebrew-amd64',
'ignition_gazebo-ci-ign-gazebo5-bionic-amd64',
'ignition_gazebo-ci-ign-gazebo5-homebrew-amd64',
'ignition_gazebo5-install-pkg-bionic-amd64',
'ignition_gazebo5-install_bottle-homebrew-amd64',
'ignition_gui-ci-ign-gui5-bionic-amd64',
'ignition_gui-ci-ign-gui5-homebrew-amd64',
'ignition_gui5-install-pkg-bionic-amd64',
'ignition_gui5-install_bottle-homebrew-amd64',
'ignition_launch-ci-ign-launch4-bionic-amd64',
'ignition_launch-ci-ign-launch4-homebrew-amd64',
'ignition_launch4-install-pkg-bionic-amd64',
'ignition_launch4-install_bottle-homebrew-amd64',
'ignition_math-ci-ign-math6-bionic-amd64',
'ignition_math-ci-ign-math6-homebrew-amd64',
'ignition_math-ci-ign-math6-windows7-amd64',
'ignition_math6-install-pkg-bionic-amd64',
'ignition_math6-install_bottle-homebrew-amd64',
'ignition_msgs-ci-ign-msgs7-bionic-amd64',
'ignition_msgs-ci-ign-msgs7-homebrew-amd64',
'ignition_msgs-ci-ign-msgs7-windows7-amd64',
'ignition_msgs7-install-pkg-bionic-amd64',
'ignition_msgs7-install_bottle-homebrew-amd64',
'ignition_physics-ci-ign-physics4-bionic-amd64',
'ignition_physics-ci-ign-physics4-homebrew-amd64',
'ignition_physics4-install-pkg-bionic-amd64',
'ignition_physics4-install_bottle-homebrew-amd64',
'ignition_plugin-ci-ign-plugin1-bionic-amd64',
'ignition_plugin-ci-ign-plugin1-homebrew-amd64',
'ignition_plugin-ci-ign-plugin1-windows7-amd64',
'ignition_plugin-install-pkg-bionic-amd64',
'ignition_plugin1-install_bottle-homebrew-amd64',
'ignition_rendering-ci-ign-rendering5-bionic-amd64',
'ignition_rendering-ci-ign-rendering5-homebrew-amd64',
'ignition_rendering5-install-pkg-bionic-amd64',
'ignition_rendering5-install_bottle-homebrew-amd64',
'ignition_sensors-ci-ign-sensors5-bionic-amd64',
'ignition_sensors-ci-ign-sensors5-homebrew-amd64',
'ignition_sensors5-install-pkg-bionic-amd64',
'ignition_sensors5-install_bottle-homebrew-amd64',
'ignition_tools-ci-ign-tools1-bionic-amd64',
'ignition_tools-ci-ign-tools1-homebrew-amd64',
'ignition_tools-ci-ign-tools1-windows7-amd64',
'ignition_tools-install-pkg-bionic-amd64',
'ignition_tools1-install_bottle-homebrew-amd64',
'ignition_transport-ci-ign-transport10-bionic-amd64',
'ignition_transport-ci-ign-transport10-homebrew-amd64',
'ign_transport-ci-win',
'ignition_transport10-install-pkg-bionic-amd64',
'ignition_transport10-install_bottle-homebrew-amd64',
'ignition_utils-ci-ign-utils1-bionic-amd64',
'ignition_utils-ci-ign-utils1-homebrew-amd64',
'sdformat-ci-sdformat11-bionic-amd64',
'sdformat-ci-sdformat11-homebrew-amd64',
'sdformat-ci-sdformat11-windows7-amd64',
'sdformat-install-sdformat11_pkg-bionic-amd64'
],
'fortress' : [
'ign_gazebo-ign-5-win',
'ign_gui-ign-5-win',
'ign_physics-ign-4-win',
'ign_rendering-ign-5-win',
'ign_sensors-ign-5-win',
'ign_utils-ign-1-win',
'ignition_fortress-ci-main-homebrew-amd64',
'ignition_fortress-install-pkg-bionic-amd64',
'ignition_fortress-install_bottle-homebrew-amd64',
'ignition_cmake-ci-ign-cmake2-bionic-amd64',
'ignition_cmake-ci-ign-cmake2-homebrew-amd64',
'ignition_cmake-ci-ign-cmake2-windows7-amd64',
'ignition_cmake2-install-pkg-bionic-amd64',
'ignition_cmake2-install_bottle-homebrew-amd64',
'ignition_common-ci-ign-common4-bionic-amd64',
'ignition_common-ci-ign-common4-homebrew-amd64',
'ignition_common-ci-ign-common4-windows7-amd64',
'ignition_common4-install-pkg-bionic-amd64',
'ignition_common4-install_bottle-homebrew-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools6-bionic-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools6-homebrew-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools6-windows7-amd64',
'ignition_fuel-tools6-install-pkg-bionic-amd64',
'ignition_fuel-tools6-install_bottle-homebrew-amd64',
'ignition_gazebo-ci-main-bionic-amd64',
'ignition_gazebo-ci-main-homebrew-amd64',
'ignition_gazebo-ci-ign-gazebo5-bionic-amd64',
'ignition_gazebo-ci-ign-gazebo5-homebrew-amd64',
'ignition_gazebo5-install-pkg-bionic-amd64',
'ignition_gazebo5-install_bottle-homebrew-amd64',
'ignition_gui-ci-main-bionic-amd64',
'ignition_gui-ci-main-homebrew-amd64',
'ignition_gui-ci-ign-gui5-bionic-amd64',
'ignition_gui-ci-ign-gui5-homebrew-amd64',
'ignition_gui5-install-pkg-bionic-amd64',
'ignition_gui5-install_bottle-homebrew-amd64',
'ignition_launch-ci-main-bionic-amd64',
'ignition_launch-ci-main-homebrew-amd64',
'ignition_launch-ci-ign-launch4-bionic-amd64',
'ignition_launch-ci-ign-launch4-homebrew-amd64',
'ignition_launch4-install-pkg-bionic-amd64',
'ignition_launch4-install_bottle-homebrew-amd64',
'ignition_math-ci-ign-math6-bionic-amd64',
'ignition_math-ci-ign-math6-homebrew-amd64',
'ignition_math-ci-ign-math6-windows7-amd64',
'ignition_math6-install-pkg-bionic-amd64',
'ignition_math6-install_bottle-homebrew-amd64',
'ignition_msgs-ci-main-bionic-amd64',
'ignition_msgs-ci-main-homebrew-amd64',
'ignition_msgs-ci-main-windows7-amd64',
'ignition_msgs-ci-ign-msgs7-bionic-amd64',
'ignition_msgs-ci-ign-msgs7-homebrew-amd64',
'ignition_msgs-ci-ign-msgs7-windows7-amd64',
'ignition_msgs7-install-pkg-bionic-amd64',
'ignition_msgs7-install_bottle-homebrew-amd64',
'ignition_physics-ci-main-bionic-amd64',
'ignition_physics-ci-main-homebrew-amd64',
'ignition_physics-ci-ign-physics4-bionic-amd64',
'ignition_physics-ci-ign-physics4-homebrew-amd64',
'ignition_physics4-install-pkg-bionic-amd64',
'ignition_physics4-install_bottle-homebrew-amd64',
'ignition_plugin-ci-ign-plugin1-bionic-amd64',
'ignition_plugin-ci-ign-plugin1-homebrew-amd64',
'ignition_plugin-ci-ign-plugin1-windows7-amd64',
'ignition_plugin-install-pkg-bionic-amd64',
'ignition_plugin1-install_bottle-homebrew-amd64',
'ignition_rendering-ci-main-bionic-amd64',
'ignition_rendering-ci-main-homebrew-amd64',
'ignition_rendering-ci-ign-rendering5-bionic-amd64',
'ignition_rendering-ci-ign-rendering5-homebrew-amd64',
'ignition_rendering5-install-pkg-bionic-amd64',
'ignition_rendering5-install_bottle-homebrew-amd64',
'ignition_sensors-ci-main-bionic-amd64',
'ignition_sensors-ci-main-homebrew-amd64',
'ignition_sensors-ci-ign-sensors5-bionic-amd64',
'ignition_sensors-ci-ign-sensors5-homebrew-amd64',
'ignition_sensors5-install-pkg-bionic-amd64',
'ignition_sensors5-install_bottle-homebrew-amd64',
'ignition_tools-ci-ign-tools1-bionic-amd64',
'ignition_tools-ci-ign-tools1-homebrew-amd64',
'ignition_tools-ci-ign-tools1-windows7-amd64',
'ignition_tools-install-pkg-bionic-amd64',
'ignition_tools1-install_bottle-homebrew-amd64',
'ignition_transport-ci-main-bionic-amd64',
'ignition_transport-ci-main-homebrew-amd64',
'ignition_transport-ci-ign-transport10-bionic-amd64',
'ignition_transport-ci-ign-transport10-homebrew-amd64',
'ign_transport-ci-win',
'ignition_transport10-install-pkg-bionic-amd64',
'ignition_transport10-install_bottle-homebrew-amd64',
'ignition_utils-ci-main-bionic-amd64',
'ignition_utils-ci-main-homebrew-amd64',
'sdformat-ci-main-bionic-amd64',
'sdformat-ci-main-homebrew-amd64',
'sdformat-ci-main-windows7-amd64',
'ignition_utils-ci-ign-utils1-bionic-amd64',
'ignition_utils-ci-ign-utils1-homebrew-amd64',
'sdformat-ci-sdformat11-bionic-amd64',
'sdformat-ci-sdformat11-homebrew-amd64',
'sdformat-ci-sdformat11-windows7-amd64',
'sdformat-install-sdformat11_pkg-bionic-amd64'
],
]
Expand Down
6 changes: 3 additions & 3 deletions jenkins-scripts/dsl/sdformat.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import _configs_.*
import javaposse.jobdsl.dsl.Job

def sdformat_supported_branches = [ 'sdformat4', 'sdformat6' , 'sdformat9', 'sdformat10' ]
def sdformat_gz11_branches = [ 'sdformat9', 'sdformat10', 'main' ]
def sdformat_supported_branches = [ 'sdformat4', 'sdformat6' , 'sdformat9', 'sdformat10', 'sdformat11' ]
def sdformat_gz11_branches = [ 'sdformat9', 'sdformat10', 'sdformat11', 'main' ]
// nightly and prereleases
def extra_sdformat_debbuilder = [ 'sdformat11' ]
def extra_sdformat_debbuilder = [ 'sdformat12' ]

// Main platform using for quick CI
def ci_distro = Globals.get_ci_distro()
Expand Down