From 705c8324af7efa289004a13f981674eb6b348b6a Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 12 Oct 2023 13:22:42 -0500 Subject: [PATCH] Create ign-ionic collection view and set up nightlies Signed-off-by: Addisu Z. Taddese --- jenkins-scripts/dsl/gz-collections.yaml | 77 +++++++++++++++++++++ jenkins-scripts/dsl/ignition.dsl | 17 ++++- jenkins-scripts/dsl/ignition_collection.dsl | 53 +++++++++++++- jenkins-scripts/dsl/sdformat.dsl | 4 +- 4 files changed, 147 insertions(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index d4c20f9c7..23b79b306 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -337,6 +337,83 @@ collections: nightly: distros: - jammy + - name: 'ionic' + libs: + - name: gz-cmake + major_version: 4 + repo: + current_branch: main + - name: gz-tools + major_version: 2 + repo: + current_branch: gz-tools2 + - name: gz-utils + major_version: 3 + repo: + current_branch: main + - name: gz-math + major_version: 8 + repo: + current_branch: main + - name: gz-plugin + major_version: 3 + repo: + current_branch: main + - name: gz-common + major_version: 6 + repo: + current_branch: main + - name: gz-msgs + major_version: 11 + repo: + current_branch: main + - name: gz-rendering + major_version: 9 + repo: + current_branch: main + - name: sdformat + major_version: 15 + repo: + current_branch: main + - name: gz-fuel-tools + major_version: 10 + repo: + current_branch: main + - name: gz-transport + major_version: 14 + repo: + current_branch: main + - name: gz-gui + major_version: 9 + repo: + current_branch: main + - name: gz-sensors + major_version: 9 + repo: + current_branch: main + - name: gz-physics + major_version: 8 + repo: + current_branch: main + - name: gz-sim + major_version: 9 + repo: + current_branch: main + - name: gz-launch + major_version: 8 + repo: + current_branch: main + ci: + configs: + - jammy + packaging: + linux: + package_name: + ignore_major_version: + - gz-ionic + nightly: + distros: + - jammy - name: '__upcoming__' libs: - name: gz-cmake diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 45f4bafdd..6fde8a44e 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -83,7 +83,22 @@ gz_prerelease_branches = [] // DESC: versioned names to generate debbuild jobs for special cases that // don't appear in gz_branches (like nightly builders or 0-debbuild // jobs for the special cases of foo0 packages) -gz_extra_debbuild = [ 'utils1' // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918 +gz_extra_debbuild = [ 'cmake4', + 'common6', + 'fuel-tools10', + 'gui9', + 'launch8', + 'math8', + 'msgs11', + 'physics8', + 'plugin3', + 'rendering9', + 'sensors9', + 'sim9', + 'transport14', + 'utils3', + + 'utils1' // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918 ] // DESC: exclude ignition from generate any install testing job gz_no_pkg_yet = [ ] diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index e30fcaff5..6d2ac3b7c 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -11,7 +11,7 @@ arch = 'amd64' file = readFileFromWorkspace("scripts/jenkins-scripts/dsl/gz-collections.yaml") gz_collections_yaml = new Yaml().load(file) -gz_nightly = 'harmonic' +gz_nightly = 'ionic' String get_debbuilder_name(parsed_yaml_lib, parsed_yaml_packaging) { @@ -325,6 +325,57 @@ gz_collection_jobs = 'sdformat-ci-sdformat14-homebrew-amd64', 'sdformat-sdf-14-win' ], + 'ionic' : [ + 'ign_cmake-gz-4-win', + 'ign_common-gz-6-win', + 'ign_fuel-tools-gz-10-win', + 'ign_gazebo-gz-9-win', + 'ign_gui-gz-9-win', + 'ign_launch-gz-8-win', + 'ign_math-gz-8-win', + 'ign_msgs-gz-11-win', + 'ign_physics-gz-8-win', + 'ign_plugin-gz-3-win', + 'ign_rendering-gz-9-win', + 'ign_sensors-gz-9-win', + 'ign_tools-gz-2-win', + 'ign_transport-gz-14-win', + 'ign_utils-gz-3-win', + 'gz_cmake-ci-gz-cmake4-jammy-amd64', + 'gz_common-ci-gz-common6-jammy-amd64', + 'gz_fuel_tools-ci-gz-fuel-tools10-jammy-amd64', + 'gz_gui-ci-gz-gui9-jammy-amd64', + 'gz_launch-ci-gz-launch8-jammy-amd64', + 'gz_math-ci-gz-math8-jammy-amd64', + 'gz_msgs-ci-gz-msgs11-jammy-amd64', + 'gz_physics-ci-gz-physics8-jammy-amd64', + 'gz_plugin-ci-gz-plugin3-jammy-amd64', + 'gz_rendering-ci-gz-rendering9-jammy-amd64', + 'gz_sensors-ci-gz-sensors9-jammy-amd64', + 'gz_sim-ci-gz-sim9-jammy-amd64', + 'gz_tools-ci-gz-tools2-jammy-amd64', + 'gz_transport-ci-gz-transport14-jammy-amd64', + 'gz_utils-ci-gz-utils3-jammy-amd64', + 'ignition_cmake-ci-gz-cmake4-homebrew-amd64', + 'ignition_common-ci-gz-common6-homebrew-amd64', + 'ignition_fuel-tools-ci-gz-fuel-tools10-homebrew-amd64', + 'ignition_ionic-ci-main-homebrew-amd64', + 'ignition_gazebo-ci-gz-sim9-homebrew-amd64', + 'ignition_gui-ci-gz-gui9-homebrew-amd64', + 'ignition_launch-gz-launch8-homebrew-amd64', + 'ignition_math-ci-gz-math8-homebrew-amd64', + 'ignition_msgs-ci-gz-msgs11-homebrew-amd64', + 'ignition_physics-ci-gz-physics8-homebrew-amd64', + 'ignition_plugin-ci-gz-plugin3-homebrew-amd64', + 'ignition_rendering-ci-gz-rendering9-homebrew-amd64', + 'ignition_sensors-ci-gz-sensors9-homebrew-amd64', + 'ignition_tools-ci-gz-tools2-homebrew-amd64', + 'ignition_transport-ci-gz-transport14-homebrew-amd64', + 'ignition_utils-ci-gz-utils3-homebrew-amd64', + 'sdformat-ci-sdformat15-jammy-amd64', + 'sdformat-ci-sdformat15-homebrew-amd64', + 'sdformat-sdf-15-win' + ], ] def DISABLE_TESTS = false diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl index d983d18f5..f93b42396 100644 --- a/jenkins-scripts/dsl/sdformat.dsl +++ b/jenkins-scripts/dsl/sdformat.dsl @@ -2,9 +2,9 @@ import _configs_.* import javaposse.jobdsl.dsl.Job def sdformat_supported_versions = [ 'sdformat6' , 'sdformat9', 'sdformat12', 'sdformat13', 'sdformat14' ] -def sdformat_gz11_versions = [ 'sdformat9', 'sdformat12', 'sdformat13', 'main' ] +def sdformat_gz11_versions = [ 'sdformat9', 'sdformat12', 'sdformat13', 'sdformat14', 'main' ] // nightly and prereleases -def extra_sdformat_debbuilder = [] +def extra_sdformat_debbuilder = ['sdformat15'] // Main platform using for quick CI def ci_distro = Globals.get_ci_distro()