From eab7c8eed4e35d49980e0599e728794c296478f8 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 9 Aug 2022 18:16:39 -0700 Subject: [PATCH 01/12] ignition.dsl: rename method Rename supported_branches to supported_ign_branches in preparation for supported_gz_branches. Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index c957b3399..6d250c79a 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -156,7 +156,7 @@ Map merge_maps(Map[] sources) { // return major versions supported or empty if just 0,1 series under // -dev package. -ArrayList supported_branches(String ign_software) +ArrayList supported_ign_branches(String ign_software) { major_versions_registered = ignition_branches["${ign_software}"] @@ -181,7 +181,7 @@ ArrayList prerelease_branches(String ign_software) ArrayList all_branches(String ign_software) { List branches = new ArrayList(); - supported_branches("${ign_software}").each { major_version -> + supported_ign_branches("${ign_software}").each { major_version -> if ("${major_version}") { branches.add("ign-${ign_software}${major_version}") } @@ -201,7 +201,7 @@ ArrayList all_debbuilders() List branches = new ArrayList(); // add all supported branches ignition_software.each { ign_software -> - supported_branches("${ign_software}").each { major_version -> + supported_ign_branches("${ign_software}").each { major_version -> if (major_version) { // No 1-debbuild versions, they use the unversioned job if ("${major_version}" == "0" || "${major_version}" == "1" ) @@ -225,11 +225,11 @@ Map supported_install_pkg_branches(String ign_software) { major_versions_prerelease = ignition_prerelease_pkgs["${ign_software}"] - // construct a map of stable packages based on supported_branches and + // construct a map of stable packages based on supported_ign_branches and // all_supported_distros map_of_stable_versions = [:] map_of_stable_versions[ign_software] = [:] - supported_branches(ign_software).each { major_version -> + supported_ign_branches(ign_software).each { major_version -> new_relation = [:] new_relation[major_version] = all_supported_distros map_of_stable_versions[ign_software] << new_relation From 9ab203a95aa0b29e843393fbadf4acef4a9f3dcf Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 9 Aug 2022 18:18:17 -0700 Subject: [PATCH 02/12] Add supported_gz_branches function Add separate logic for gz-* branches. Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 6d250c79a..05c02b437 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -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 @@ -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) @@ -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}") { @@ -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 -> From 558d0e69ad9b40e3cf3cb0d5b06bfa81bafe9dc8 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 9 Aug 2022 18:18:39 -0700 Subject: [PATCH 03/12] sdformat.dsl: add sdf13 to supported branch list Signed-off-by: Steve Peters --- jenkins-scripts/dsl/sdformat.dsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl index de9e37c15..e219cb6eb 100644 --- a/jenkins-scripts/dsl/sdformat.dsl +++ b/jenkins-scripts/dsl/sdformat.dsl @@ -1,10 +1,10 @@ import _configs_.* import javaposse.jobdsl.dsl.Job -def sdformat_supported_branches = [ 'sdformat6' , 'sdformat9', 'sdformat12' ] -def sdformat_gz11_branches = [ 'sdformat9', 'sdformat10', 'sdformat12', 'main' ] +def sdformat_supported_branches = [ 'sdformat6' , 'sdformat9', 'sdformat12', 'sdformat13' ] +def sdformat_gz11_branches = [ 'sdformat9', 'sdformat12', 'sdformat13', 'main' ] // nightly and prereleases -def extra_sdformat_debbuilder = [ 'sdformat13' ] +def extra_sdformat_debbuilder = [ ] // Main platform using for quick CI def ci_distro = Globals.get_ci_distro() From 094c4d9ce57282804cfa83b3cb61a676820c8b7e Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 10 Aug 2022 14:26:59 -0700 Subject: [PATCH 04/12] fix typo Signed-off-by: Steve Peters Co-authored-by: Louise Poubel --- jenkins-scripts/dsl/ignition.dsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 05c02b437..8aa3288fd 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -182,7 +182,7 @@ ArrayList supported_ign_branches(String ign_software) } ArrayList supported_gz_branches(String gz_software) { - major_versions_registered = gzition_branches["${gz_software}"] + major_versions_registered = gz_branches["${gz_software}"] if (major_versions_registered == null) return [ '' ] From f23a25051c795deb66610fe682f5d3483c10b927 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 10 Aug 2022 14:33:05 -0700 Subject: [PATCH 05/12] Add todo comment for install jobs Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 8aa3288fd..edc8d860c 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -258,6 +258,7 @@ ArrayList all_debbuilders() // return all ci branch names // Map with the form of: major versions as keys. // Lists of distros supported as values +// @TODO[scpeters] update this to support gz_branches after garden release Map supported_install_pkg_branches(String ign_software) { major_versions_prerelease = ignition_prerelease_pkgs["${ign_software}"] From 312c4a20fbb6b979a73f00f1f99924b84e0a9485 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 10 Aug 2022 15:12:26 -0700 Subject: [PATCH 06/12] fix gz_software errors Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index edc8d860c..89099db88 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -210,9 +210,9 @@ ArrayList all_branches(String ign_software) branches.add("ign-${ign_software}${major_version}") } } - supported_gz_branches("${gz_software}").each { major_version -> + supported_gz_branches("${ign_software}").each { major_version -> if ("${major_version}") { - branches.add("gz-${gz_software}${major_version}") + branches.add("gz-${ign_software}${major_version}") } } branches.add('main') @@ -238,12 +238,12 @@ ArrayList all_debbuilders() branches.add("ign-${ign_software}${major_version}") } } - supported_gz_branches("${gz_software}").each { major_version -> + supported_gz_branches("${ign_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}") + branches.add("gz-${ign_software}${major_version}") } } } From 5dc4eaeb75dc700308dec7758390d309306c3843 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 11 Aug 2022 14:52:45 -0700 Subject: [PATCH 07/12] Adjust whitespace Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 89099db88..d6de3b830 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -235,7 +235,8 @@ ArrayList all_debbuilders() // No 1-debbuild versions, they use the unversioned job if ("${major_version}" == "0" || "${major_version}" == "1" ) major_version = "" - branches.add("ign-${ign_software}${major_version}") + + branches.add("ign-${ign_software}${major_version}") } } supported_gz_branches("${ign_software}").each { major_version -> @@ -243,7 +244,8 @@ ArrayList all_debbuilders() // No 1-debbuild versions, they use the unversioned job if ("${major_version}" == "0" || "${major_version}" == "1" ) major_version = "" - branches.add("gz-${ign_software}${major_version}") + + branches.add("gz-${ign_software}${major_version}") } } } From 2801fb191d6fc1e1a530ba5dfe2a522e0dcddef4 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 11 Aug 2022 14:53:06 -0700 Subject: [PATCH 08/12] Don't use gz- prefix for debbuilder job names Remove garden jobs from extra_debbuild array. Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index d6de3b830..cd9ac70cc 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -80,22 +80,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_extra_debbuild = [ 'cmake3', - 'common5', - 'fuel-tools8', - 'gazebo7', - 'gui7', - 'launch6', - 'math7', - 'msgs9', - 'physics6', - 'plugin2', - 'rendering7', - 'sensors7', - 'tools2', - 'transport12', - 'utils1', // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918 - 'utils2'] +ignition_extra_debbuild = [ 'utils1'] // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918 // 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 @@ -245,7 +230,7 @@ ArrayList all_debbuilders() if ("${major_version}" == "0" || "${major_version}" == "1" ) major_version = "" - branches.add("gz-${ign_software}${major_version}") + branches.add("ign-${ign_software}${major_version}") } } } From 5c2940212aee4e3b37ce3b1195c9f79faba2fae8 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 11 Aug 2022 14:54:17 -0700 Subject: [PATCH 09/12] Update special branch names for windows Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index cd9ac70cc..1c1b7f22f 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -686,11 +686,11 @@ ignition_software.each { ign_sw -> // ign-gazebo only support Windows from ign-gazebo5 if (ign_sw == 'gazebo') - supported_branches = [ 'ign-gazebo6', 'main' ] + supported_branches = [ 'ign-gazebo6', 'gz-sim7', 'main' ] // ign-launch only support Windows from ign-launch5 if (ign_sw == 'launch') - supported_branches = [ 'ign-launch5', 'main' ] + supported_branches = [ 'ign-launch5', 'gz-launch6', 'main' ] def ignition_win_ci_any_job = job(ignition_win_ci_any_job_name) OSRFWinCompilationAnyGitHub.create(ignition_win_ci_any_job, @@ -736,11 +736,11 @@ ignition_software.each { ign_sw -> ignition_win_ci_job.with { // ign-gazebo only works on Windows from ign-gazebo5 - if (branch == 'ign-gazebo3' || branch == 'ign-gazebo4') + if (branch == 'ign-gazebo3') disabled() // ign-launch was not ported to windows until 5 - if (branch == 'ign-launch2' || branch == 'ign-launch3' || branch == 'ign-launch4') + if (branch == 'ign-launch2') disabled() triggers { From 8c84a3cca3ff5ce6921cdf313dae712adf9157b0 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 11 Aug 2022 15:11:58 -0700 Subject: [PATCH 10/12] Add sim to package arrays Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 1c1b7f22f..c64083bbe 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -14,6 +14,7 @@ ignition_software = [ 'cmake', 'plugin', 'rendering', 'sensors', + 'sim', 'tools', 'transport', 'utils' ] @@ -21,7 +22,8 @@ ignition_software = [ 'cmake', ignition_gpu = [ 'gazebo', 'gui', 'rendering', - 'sensors' ] + 'sensors', + 'sim' ] // DESC: software does not support cmake warnings enabled ignition_no_cmake_warnings = [ 'cmake', 'common', @@ -101,6 +103,7 @@ ignition_colcon_win = [ 'common', 'plugin', 'rendering', 'sensors', + 'sim', 'tools', 'transport', 'utils' ] From f652564a1b3d24f12f882fe0e0d0b286715e83f4 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 11 Aug 2022 15:22:19 -0700 Subject: [PATCH 11/12] Revert "Add sim to package arrays" This reverts commit 8c84a3cca3ff5ce6921cdf313dae712adf9157b0. Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index c64083bbe..1c1b7f22f 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -14,7 +14,6 @@ ignition_software = [ 'cmake', 'plugin', 'rendering', 'sensors', - 'sim', 'tools', 'transport', 'utils' ] @@ -22,8 +21,7 @@ ignition_software = [ 'cmake', ignition_gpu = [ 'gazebo', 'gui', 'rendering', - 'sensors', - 'sim' ] + 'sensors' ] // DESC: software does not support cmake warnings enabled ignition_no_cmake_warnings = [ 'cmake', 'common', @@ -103,7 +101,6 @@ ignition_colcon_win = [ 'common', 'plugin', 'rendering', 'sensors', - 'sim', 'tools', 'transport', 'utils' ] From 334f801e3315c1babc017e6a372170a7dcfc6753 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 11 Aug 2022 15:32:18 -0700 Subject: [PATCH 12/12] restore ign-gazebo7 debbuilder Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition.dsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 1c1b7f22f..2c8fc63e5 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -80,7 +80,8 @@ 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_extra_debbuild = [ 'utils1'] // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918 +ignition_extra_debbuild = [ 'gazebo7', + 'utils1'] // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918 // 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