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

ignition.dsl: enable CI for dome branches #299

Merged
merged 3 commits into from
Oct 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 12 additions & 19 deletions jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ ignition_no_test = [ 'tools' ]
// master, ABI check, install pkg)
ignition_branches = [ 'cmake' : [ '1', '2' ],
'common' : [ '1', '2', '3' ],
'fuel-tools' : [ '1', '2', '3', '4' ],
'gazebo' : [ '2', '3' ],
'gui' : [ '0', '2', '3' ],
'launch' : [ '1', '2' ],
'fuel-tools' : [ '1', '2', '3', '4', '5' ],
'gazebo' : [ '2', '3', '4' ],
'gui' : [ '0', '2', '3', '4' ],
'launch' : [ '1', '2', '3' ],
'math' : [ '2', '4', '5', '6' ],
'msgs' : [ '1', '2', '4', '5' ],
'physics' : [ '1', '2' ],
'msgs' : [ '1', '2', '4', '5', '6' ],
'physics' : [ '1', '2', '3' ],
'plugin' : [ '0', '1' ],
'rendering' : [ '2', '3' ],
'sensors' : [ '2', '3' ],
'transport' : [ '4', '5', '7', '8' ],
'rendering' : [ '2', '3', '4' ],
'sensors' : [ '2', '3', '4' ],
'transport' : [ '4', '5', '7', '8', '9' ],
'tools' : [ '0', '1' ]]
// DESC: prerelease branches are managed as any other supported branches for
// special cases different to major branches: get compilation CI on the branch
Expand All @@ -49,16 +49,7 @@ ignition_prerelease_branches = []
// DESC: versioned names to generate debbuild jobs for special cases that
// don't appear in ignition_branches (like nightly builders or 0-debbuild
// jobs for the special cases of foo0 packages)
ignition_debbuild = ignition_software + [ 'fuel-tools5',
'gazebo4',
'gui4',
'launch3',
'math6',
'msgs6',
'physics3',
'rendering4',
'sensors4',
'transport9']
ignition_debbuild = ignition_software + [ ]
// DESC: exclude ignition from generate any install testing job
ignition_no_pkg_yet = [ 'rndf' ]
// DESC: major versions that has a package in the prerelease repo. Should
Expand Down Expand Up @@ -427,6 +418,7 @@ ignition_software.each { ign_sw ->
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs3") ||
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs4") ||
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs5") ||
("${ign_sw}" == "msgs" && "${branch}" == "ign-msgs6") ||
("${ign_sw}" == "msgs" && "${branch}" == "master") ||
("${ign_sw}" == "physics") ||
("${ign_sw}" == "plugin" && "${branch}" != "ign-plugin0") ||
Expand All @@ -436,6 +428,7 @@ ignition_software.each { ign_sw ->
("${ign_sw}" == "transport" && "${branch}" == "ign-transport6") ||
("${ign_sw}" == "transport" && "${branch}" == "ign-transport7") ||
("${ign_sw}" == "transport" && "${branch}" == "ign-transport8") ||
("${ign_sw}" == "transport" && "${branch}" == "ign-transport9") ||
("${ign_sw}" == "transport" && "${branch}" == "master")))
disabled()

Expand Down
114 changes: 57 additions & 57 deletions jenkins-scripts/dsl/ignition_collection.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ ignition_collections = [
[ name : 'dome',
distros : [ 'focal' ],
nightly_jobs: [
'fuel-tools': [ debbuild: 'ign-fuel-tools5', branch: 'master '],
'gazebo' : [ debbuild: 'ign-gazebo4' , branch: 'master' ],
'gui' : [ debbuild: 'ign-gui4' , branch: 'master' ],
'launch' : [ debbuild: 'ign-launch3' , branch: 'master' ],
'msgs' : [ debbuild: 'ign-msgs6' , branch: 'master' ],
'physics' : [ debbuild: 'ign-physics3' , branch: 'master' ],
'rendering' : [ debbuild: 'ign-rendering4' , branch: 'master' ],
'sensors' : [ debbuild: 'ign-sensors4' , branch: 'master' ],
'fuel-tools': [ debbuild: 'ign-fuel-tools5', branch: 'ign-fuel-tools5 '],
'gazebo' : [ debbuild: 'ign-gazebo4' , branch: 'ign-gazebo4' ],
'gui' : [ debbuild: 'ign-gui4' , branch: 'ign-gui4' ],
'launch' : [ debbuild: 'ign-launch3' , branch: 'ign-launch3' ],
'msgs' : [ debbuild: 'ign-msgs6' , branch: 'ign-msgs6' ],
'physics' : [ debbuild: 'ign-physics3' , branch: 'ign-physics3' ],
'rendering' : [ debbuild: 'ign-rendering4' , branch: 'ign-rendering4' ],
'sensors' : [ debbuild: 'ign-sensors4' , branch: 'ign-sensors4' ],
'sdformat' : [ debbuild: 'sdformat10' , branch: 'sdf10' ],
'transport' : [ debbuild: 'ign-transport9' , branch: 'master' ],
'transport' : [ debbuild: 'ign-transport9' , branch: 'ign-transort9' ],
],
],
]
Expand Down Expand Up @@ -190,14 +190,14 @@ ignition_collection_jobs =
'sdformat-install-sdformat9_pkg-bionic-amd64'
],
'dome' : [
'ign_gazebo-ci-win',
'ign_gui-ci-win',
'ign_physics-ci-win',
'ign_rendering-ci-win',
'ign_sensors-ci-win',
'ign_gazebo-ign-4-win',
'ign_gui-ign-4-win',
'ign_physics-ign-3-win',
'ign_rendering-ign-4-win',
'ign_sensors-ign-4-win',
'ignition_dome-ci-master-homebrew-amd64',
//'ignition_dome-install-pkg-bionic-amd64',
//'ignition_dome-install_bottle-homebrew-amd64',
'ignition_dome-install-pkg-bionic-amd64',
'ignition_dome-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',
Expand All @@ -208,64 +208,64 @@ ignition_collection_jobs =
'ignition_common-ci-ign-common3-windows7-amd64',
'ignition_common3-install-pkg-bionic-amd64',
'ignition_common3-install_bottle-homebrew-amd64',
'ignition_fuel-tools-ci-master-bionic-amd64',
'ignition_fuel-tools-ci-master-homebrew-amd64',
'ignition_fuel-tools-ci-master-windows7-amd64',
// 'ignition_fuel-tools5-install-pkg-bionic-amd64',
// 'ignition_fuel-tools5-install_bottle-homebrew-amd64',
'ignition_gazebo-ci-master-bionic-amd64',
'ignition_gazebo-ci-master-homebrew-amd64',
// 'ignition_gazebo4-install-pkg-bionic-amd64',
// 'ignition_gazebo4-install_bottle-homebrew-amd64',
'ignition_gui-ci-master-bionic-amd64',
'ignition_gui-ci-master-homebrew-amd64',
// 'ignition_gui4-install-pkg-bionic-amd64',
// 'ignition_gui4-install_bottle-homebrew-amd64',
'ignition_launch-ci-master-bionic-amd64',
'ignition_launch-ci-master-homebrew-amd64',
// 'ignition_launch3-install-pkg-bionic-amd64',
// 'ignition_launch3-install_bottle-homebrew-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools5-bionic-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools5-homebrew-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools5-windows7-amd64',
'ignition_fuel-tools5-install-pkg-bionic-amd64',
'ignition_fuel-tools5-install_bottle-homebrew-amd64',
'ignition_gazebo-ci-ign-gazebo4-bionic-amd64',
'ignition_gazebo-ci-ign-gazebo4-homebrew-amd64',
'ignition_gazebo4-install-pkg-bionic-amd64',
'ignition_gazebo4-install_bottle-homebrew-amd64',
'ignition_gui-ci-ign-gui4-bionic-amd64',
'ignition_gui-ci-ign-gui4-homebrew-amd64',
'ignition_gui4-install-pkg-bionic-amd64',
'ignition_gui4-install_bottle-homebrew-amd64',
'ignition_launch-ci-ign-launch3-bionic-amd64',
'ignition_launch-ci-ign-launch3-homebrew-amd64',
'ignition_launch3-install-pkg-bionic-amd64',
'ignition_launch3-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-master-bionic-amd64',
'ignition_msgs-ci-master-homebrew-amd64',
'ignition_msgs-ci-master-windows7-amd64',
// 'ignition_msgs6-install-pkg-bionic-amd64',
// 'ignition_msgs6-install_bottle-homebrew-amd64',
'ignition_physics-ci-master-bionic-amd64',
'ignition_physics-ci-master-homebrew-amd64',
// 'ignition_physics3-install-pkg-bionic-amd64',
// 'ignition_physics3-install_bottle-homebrew-amd64',
'ignition_msgs-ci-ign-msgs6-bionic-amd64',
'ignition_msgs-ci-ign-msgs6-homebrew-amd64',
'ignition_msgs-ci-ign-msgs6-windows7-amd64',
'ignition_msgs6-install-pkg-bionic-amd64',
'ignition_msgs6-install_bottle-homebrew-amd64',
'ignition_physics-ci-ign-physics3-bionic-amd64',
'ignition_physics-ci-ign-physics3-homebrew-amd64',
'ignition_physics3-install-pkg-bionic-amd64',
'ignition_physics3-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-master-bionic-amd64',
'ignition_rendering-ci-master-homebrew-amd64',
// 'ignition_rendering4-install-pkg-bionic-amd64',
// 'ignition_rendering4-install_bottle-homebrew-amd64',
'ignition_sensors-ci-master-bionic-amd64',
'ignition_sensors-ci-master-homebrew-amd64',
// 'ignition_sensors4-install-pkg-bionic-amd64',
// 'ignition_sensors4-install_bottle-homebrew-amd64',
'ignition_rendering-ci-ign-rendering4-bionic-amd64',
'ignition_rendering-ci-ign-rendering4-homebrew-amd64',
'ignition_rendering4-install-pkg-bionic-amd64',
'ignition_rendering4-install_bottle-homebrew-amd64',
'ignition_sensors-ci-ign-sensors4-bionic-amd64',
'ignition_sensors-ci-ign-sensors4-homebrew-amd64',
'ignition_sensors4-install-pkg-bionic-amd64',
'ignition_sensors4-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-master-bionic-amd64',
'ignition_transport-ci-master-homebrew-amd64',
'ignition_transport-ci-master-windows7-amd64',
// 'ignition_transport9-install-pkg-bionic-amd64',
// 'ignition_transport9-install_bottle-homebrew-amd64',
'ignition_tools1-install_bottle-homebrew-amd64',
'ignition_transport-ci-ign-transport9-bionic-amd64',
'ignition_transport-ci-ign-transport9-homebrew-amd64',
'ignition_transport-ci-ign-transport9-windows7-amd64',
'ignition_transport9-install-pkg-bionic-amd64',
'ignition_transport9-install_bottle-homebrew-amd64',
'sdformat-ci-sdformat10-bionic-amd64',
'sdformat-ci-sdformat10-homebrew-amd64',
'sdformat-ci-sdformat10-windows7-amd64',
// 'sdformat-install-sdformat10_pkg-bionic-amd64'
'sdformat-install-sdformat10_pkg-bionic-amd64'
],
]

Expand Down