Skip to content

Commit

Permalink
Add supported_gz_branches function
Browse files Browse the repository at this point in the history
Add separate logic for gz-* branches.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
  • Loading branch information
scpeters committed Aug 10, 2022
1 parent eab7c8e commit 9ab203a
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,21 @@ ignition_branches = [ 'cmake' : [ '2' ],
'tools' : [ '1' ],
'transport' : [ '4', '8', '11' ],
'utils' : [ '1' ]]
gz_branches = [ 'cmake' : [ '3' ],
'common' : [ '5' ],
'fuel-tools' : [ '8' ],
'gui' : [ '7' ],
'launch' : [ '6' ],
'math' : [ '7' ],
'msgs' : [ '9' ],
'physics' : [ '6' ],
'plugin' : [ '2' ],
'rendering' : [ '7' ],
'sensors' : [ '7' ],
'sim' : [ '7' ],
'tools' : [ '2' ],
'transport' : [ '12' ],
'utils' : [ '2' ]]
// 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 Down Expand Up @@ -165,6 +180,15 @@ ArrayList supported_ign_branches(String ign_software)

return major_versions_registered
}
ArrayList supported_gz_branches(String gz_software)
{
major_versions_registered = gzition_branches["${gz_software}"]

if (major_versions_registered == null)
return [ '' ]

return major_versions_registered
}

// return prerelease branch names
ArrayList prerelease_branches(String ign_software)
Expand All @@ -186,6 +210,11 @@ ArrayList all_branches(String ign_software)
branches.add("ign-${ign_software}${major_version}")
}
}
supported_gz_branches("${gz_software}").each { major_version ->
if ("${major_version}") {
branches.add("gz-${gz_software}${major_version}")
}
}
branches.add('main')
prerelease_branches("${ign_software}").each { branch ->
if ("${branch}") {
Expand All @@ -209,6 +238,14 @@ ArrayList all_debbuilders()
branches.add("ign-${ign_software}${major_version}")
}
}
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" )
major_version = ""
branches.add("gz-${gz_software}${major_version}")
}
}
}
// add all extra debbuilders
ignition_extra_debbuild.each { ign_name ->
Expand Down

0 comments on commit 9ab203a

Please sign in to comment.