From 70a19a1b6ec4baff3816476728e73b5694044316 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 21 Nov 2023 18:08:48 +0100 Subject: [PATCH 1/8] Remove old windows pr_any generation on ignition.dsl (#1081) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/ignition.dsl | 43 -------------------------------- 1 file changed, 43 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index a0b6be5dd..4a0a324c3 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -606,49 +606,6 @@ gz_software.each { gz_sw -> // -------------------------------------------------------------- // WINDOWS: CI job -// 1. any -gz_software.each { gz_sw -> - - if (gz_sw == 'sim') - return - - if (is_a_colcon_package(gz_sw)) { - // colcon uses long paths and windows has a hard limit of 260 chars. Keep - // names minimal - gz_win_ci_any_job_name = "ign_${gz_sw}-pr-win" - Globals.gazebodistro_branch = true - } else { - gz_win_ci_any_job_name = "ignition_${gz_sw}-ci-pr_any-windows7-amd64" - Globals.gazebodistro_branch = false - } - - supported_branches = [] - - // ign-gazebo only support Windows from ign-gazebo5 - if (gz_sw == 'gazebo') { - supported_branches = [ 'ign-gazebo6', 'gz-sim7', 'main' ] - } - - // ign-launch only support Windows from ign-launch5 - if (gz_sw == 'launch') - supported_branches = [ 'ign-launch5', 'gz-launch6', 'main' ] - - def gz_win_ci_any_job = job(gz_win_ci_any_job_name) - OSRFWinCompilationAnyGitHub.create(gz_win_ci_any_job, - "gazebosim/gz-${gz_sw}", - enable_testing(gz_sw), - supported_branches, - ENABLE_GITHUB_PR_INTEGRATION, - enable_cmake_warnings(gz_sw)) - gz_win_ci_any_job.with - { - description 'Automatic generated job by DSL jenkins. Stub job for migration, not doing any check' - } - - // add ci-pr_any to the list for CIWorkflow - ci_pr_any_list[gz_sw] << gz_win_ci_any_job_name -} - // Main CI workflow gz_software.each { gz_sw -> if (gz_sw == 'sim') From a41ab11bacac6c0c0017de074e3c6676ef90ddd2 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 27 Nov 2023 08:16:34 -0800 Subject: [PATCH 2/8] Jenkins views: fix some job names (#1079) --------- Signed-off-by: Steve Peters --- jenkins-scripts/dsl/ignition_collection.dsl | 465 ++++++++++---------- 1 file changed, 232 insertions(+), 233 deletions(-) diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index d5096bf3e..660bb8b58 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -27,167 +27,166 @@ String get_debbuilder_name(parsed_yaml_lib, parsed_yaml_packaging) gz_collection_jobs = [ 'citadel' : [ - 'ign_cmake-ign-2-win', - 'ign_common-ign-3-win', - 'ign_fuel-tools-ign-4-win', - 'ign_gazebo-ign-3-win', - 'ign_gui-ign-3-win', - 'ign_math-ign-6-win', - 'ign_msgs-ign-5-win', - 'ign_physics-ign-2-win', - 'ign_plugin-ign-1-win', - 'ign_rendering-ign-3-win', - 'ign_sensors-ign-3-win', - 'ign_tools-ign-1-win', - 'ign_transport-ign-8-win', + 'ign_cmake-2-win', + 'ign_common-3-win', + 'ign_fuel-tools-4-win', + 'ign_gazebo-3-win', + 'ign_gui-3-win', + 'ign_math-6-win', + 'ign_msgs-5-win', + 'ign_physics-2-win', + 'ign_plugin-1-win', + 'ign_rendering-3-win', + 'ign_sensors-3-win', + 'ign_tools-1-win', + 'ign_transport-8-win', 'ignition_citadel-ci-main-homebrew-amd64', 'ignition_citadel-install-pkg-bionic-amd64', 'ignition_citadel-install_bottle-homebrew-amd64', - 'ignition_cmake-ci-ign-cmake2-focal-amd64', - 'ignition_cmake-ci-ign-cmake2-homebrew-amd64', + 'ign_cmake-ci-ign-cmake2-bionic-amd64', + 'ign_cmake-ci-ign-cmake2-homebrew-amd64', 'ignition_cmake2-install-pkg-focal-amd64', 'ignition_cmake2-install_bottle-homebrew-amd64', - 'ignition_common-ci-ign-common3-focal-amd64', - 'ignition_common-ci-ign-common3-homebrew-amd64', + 'ign_common-ci-ign-common3-bionic-amd64', + 'ign_common-ci-ign-common3-homebrew-amd64', 'ignition_common3-install-pkg-focal-amd64', 'ignition_common3-install_bottle-homebrew-amd64', - 'ignition_fuel-tools-ci-ign-fuel-tools4-focal-amd64', - 'ignition_fuel-tools-ci-ign-fuel-tools4-homebrew-amd64', + 'ign_fuel-tools-ci-ign-fuel-tools4-bionic-amd64', + 'ign_fuel-tools-ci-ign-fuel-tools4-homebrew-amd64', 'ignition_fuel-tools4-install-pkg-focal-amd64', 'ignition_fuel-tools4-install_bottle-homebrew-amd64', - 'ignition_gazebo-ci-ign-gazebo3-focal-amd64', - 'ignition_gazebo-ci-ign-gazebo3-homebrew-amd64', + 'ign_gazebo-ci-ign-gazebo3-bionic-amd64', + 'ign_gazebo-ci-ign-gazebo3-homebrew-amd64', 'ignition_gazebo3-install-pkg-focal-amd64', 'ignition_gazebo3-install_bottle-homebrew-amd64', - 'ignition_gui-ci-ign-gui3-focal-amd64', - 'ignition_gui-ci-ign-gui3-homebrew-amd64', + 'ign_gui-ci-ign-gui3-bionic-amd64', + 'ign_gui-ci-ign-gui3-homebrew-amd64', 'ignition_gui3-install-pkg-focal-amd64', 'ignition_gui3-install_bottle-homebrew-amd64', - 'ignition_launch-ci-ign-launch2-focal-amd64', - 'ignition_launch-ci-ign-launch2-homebrew-amd64', + 'ign_launch-ci-ign-launch2-bionic-amd64', + 'ign_launch-ci-ign-launch2-homebrew-amd64', 'ignition_launch2-install-pkg-focal-amd64', 'ignition_launch2-install_bottle-homebrew-amd64', - 'ignition_math-ci-ign-math6-focal-amd64', - 'ignition_math-ci-ign-math6-homebrew-amd64', + 'ign_math-ci-ign-math6-bionic-amd64', + 'ign_math-ci-ign-math6-homebrew-amd64', 'ignition_math6-install-pkg-focal-amd64', 'ignition_math6-install_bottle-homebrew-amd64', - 'ignition_msgs-ci-ign-msgs5-focal-amd64', - 'ignition_msgs-ci-ign-msgs5-homebrew-amd64', + 'ign_msgs-ci-ign-msgs5-bionic-amd64', + 'ign_msgs-ci-ign-msgs5-homebrew-amd64', 'ignition_msgs5-install-pkg-focal-amd64', 'ignition_msgs5-install_bottle-homebrew-amd64', - 'ignition_physics-ci-ign-physics2-focal-amd64', - 'ignition_physics-ci-ign-physics2-homebrew-amd64', + 'ign_physics-ci-ign-physics2-bionic-amd64', + 'ign_physics-ci-ign-physics2-homebrew-amd64', 'ignition_physics2-install-pkg-focal-amd64', 'ignition_physics2-install_bottle-homebrew-amd64', - 'ignition_plugin-ci-ign-plugin1-focal-amd64', - 'ignition_plugin-ci-ign-plugin1-homebrew-amd64', + 'ign_plugin-ci-ign-plugin1-bionic-amd64', + 'ign_plugin-ci-ign-plugin1-homebrew-amd64', 'ignition_plugin-install-pkg-focal-amd64', 'ignition_plugin1-install_bottle-homebrew-amd64', - 'ignition_rendering-ci-ign-rendering3-focal-amd64', - 'ignition_rendering-ci-ign-rendering3-homebrew-amd64', + 'ign_rendering-ci-ign-rendering3-bionic-amd64', + 'ign_rendering-ci-ign-rendering3-homebrew-amd64', 'ignition_rendering3-install-pkg-focal-amd64', 'ignition_rendering3-install_bottle-homebrew-amd64', - 'ignition_sensors-ci-ign-sensors3-focal-amd64', - 'ignition_sensors-ci-ign-sensors3-homebrew-amd64', + 'ign_sensors-ci-ign-sensors3-bionic-amd64', + 'ign_sensors-ci-ign-sensors3-homebrew-amd64', 'ignition_sensors3-install-pkg-focal-amd64', 'ignition_sensors3-install_bottle-homebrew-amd64', - 'ignition_tools-ci-ign-tools1-focal-amd64', - 'ignition_tools-ci-ign-tools1-homebrew-amd64', + 'ign_tools-ci-ign-tools1-bionic-amd64', + 'ign_tools-ci-ign-tools1-homebrew-amd64', 'ignition_tools-install-pkg-focal-amd64', 'ignition_tools1-install_bottle-homebrew-amd64', - 'ignition_transport-ci-ign-transport8-focal-amd64', - 'ignition_transport-ci-ign-transport8-homebrew-amd64', + 'ign_transport-ci-ign-transport8-bionic-amd64', + 'ign_transport-ci-ign-transport8-homebrew-amd64', 'ignition_transport8-install-pkg-focal-amd64', 'ignition_transport8-install_bottle-homebrew-amd64', - 'sdformat-ci-sdformat9-focal-amd64', - 'sdformat-ci-sdformat9-homebrew-amd64', - 'sdformat-ci-sdformat9-windows7-amd64', + 'sdformat-ci-sdf9-bionic-amd64', + 'sdformat-ci-sdf9-homebrew-amd64', 'sdformat-install-sdformat9_pkg-focal-amd64', - 'sdformat-sdf-9-win' + 'sdformat-sdf9-win' ], 'fortress' : [ - 'ign_cmake-ign-2-win', - 'ign_common-ign-4-win', - 'ign_fuel-tools-ign-7-win', - 'ign_gazebo-ign-6-win', - 'ign_gui-ign-6-win', - 'ign_launch-ign-5-win', - 'ign_math-ign-6-win', - 'ign_msgs-ign-8-win', - 'ign_physics-ign-5-win', - 'ign_plugin-ign-1-win', - 'ign_rendering-ign-6-win', - 'ign_sensors-ign-6-win', - 'ign_tools-ign-1-win', - 'ign_transport-ign-11-win', - 'ign_utils-ign-1-win', - 'ignition_cmake-ci-ign-cmake2-focal-amd64', - 'ignition_cmake-ci-ign-cmake2-homebrew-amd64', - 'ignition_cmake2-install-pkg-focal-amd64', + 'gz_cmake-ign-cmake2-win', + 'gz_common-ign-common4-win', + 'gz_fuel_tools-ign-fuel-tools7-win', + 'gz_sim-ign-gazebo6-win', + 'gz_gui-ign-gui6-win', + 'gz_launch-ign-launch5-win', + 'gz_math-ign-math6-win', + 'gz_msgs-ign-msgs8-win', + 'gz_physics-ign-physics5-win', + 'gz_plugin-ign-plugin1-win', + 'gz_rendering-ign-rendering6-win', + 'gz_sensors-ign-sensors6-win', + 'gz_tools-ign-tools1-win', + 'gz_transport-ign-transport11-win', + 'gz_utils-ign-utils1-win', + 'gz_cmake-ci-ign-cmake2-focal-amd64', + 'gz_cmake-ci-ign-cmake2-homebrew-amd64', + 'gz_cmake2-install-pkg-focal-amd64', 'ignition_cmake2-install_bottle-homebrew-amd64', - 'ignition_common-ci-ign-common4-focal-amd64', - 'ignition_common-ci-ign-common4-homebrew-amd64', - 'ignition_common4-install-pkg-focal-amd64', + 'gz_common-ci-ign-common4-focal-amd64', + 'gz_common-ci-ign-common4-homebrew-amd64', + 'gz_common4-install-pkg-focal-amd64', 'ignition_common4-install_bottle-homebrew-amd64', 'ignition_fortress-ci-main-homebrew-amd64', 'ignition_fortress-install-pkg-focal-amd64', 'ignition_fortress-install_bottle-homebrew-amd64', - 'ignition_fuel-tools-ci-ign-fuel-tools7-focal-amd64', - 'ignition_fuel-tools-ci-ign-fuel-tools7-homebrew-amd64', - 'ignition_fuel-tools7-install-pkg-focal-amd64', + 'gz_fuel-tools-ci-ign-fuel-tools7-focal-amd64', + 'gz_fuel-tools-ci-ign-fuel-tools7-homebrew-amd64', + 'gz_fuel-tools7-install-pkg-focal-amd64', 'ignition_fuel-tools7-install_bottle-homebrew-amd64', - 'ignition_gazebo-ci-ign-gazebo6-focal-amd64', - 'ignition_gazebo-ci-ign-gazebo6-homebrew-amd64', + 'gz_sim-ci-ign-gazebo6-focal-amd64', + 'gz_sim-ci-ign-gazebo6-homebrew-amd64', 'ignition_gazebo6-install-pkg-focal-amd64', 'ignition_gazebo6-install_bottle-homebrew-amd64', - 'ignition_gui-ci-ign-gui6-focal-amd64', - 'ignition_gui-ci-ign-gui6-homebrew-amd64', - 'ignition_gui6-install-pkg-focal-amd64', + 'gz_gui-ci-ign-gui6-focal-amd64', + 'gz_gui-ci-ign-gui6-homebrew-amd64', + 'gz_gui6-install-pkg-focal-amd64', 'ignition_gui6-install_bottle-homebrew-amd64', - 'ignition_launch-ci-ign-launch5-focal-amd64', - 'ignition_launch-ci-ign-launch5-homebrew-amd64', - 'ignition_launch5-install-pkg-focal-amd64', + 'gz_launch-ci-ign-launch5-focal-amd64', + 'gz_launch-ci-ign-launch5-homebrew-amd64', + 'gz_launch5-install-pkg-focal-amd64', 'ignition_launch5-install_bottle-homebrew-amd64', - 'ignition_math-ci-ign-math6-focal-amd64', - 'ignition_math-ci-ign-math6-homebrew-amd64', - 'ignition_math6-install-pkg-focal-amd64', + 'gz_math-ci-ign-math6-focal-amd64', + 'gz_math-ci-ign-math6-homebrew-amd64', + 'gz_math6-install-pkg-focal-amd64', 'ignition_math6-install_bottle-homebrew-amd64', - 'ignition_msgs-ci-ign-msgs8-focal-amd64', - 'ignition_msgs-ci-ign-msgs8-homebrew-amd64', - 'ignition_msgs8-install-pkg-focal-amd64', + 'gz_msgs-ci-ign-msgs8-focal-amd64', + 'gz_msgs-ci-ign-msgs8-homebrew-amd64', + 'gz_msgs8-install-pkg-focal-amd64', 'ignition_msgs8-install_bottle-homebrew-amd64', - 'ignition_physics-ci-ign-physics5-focal-amd64', - 'ignition_physics-ci-ign-physics5-homebrew-amd64', - 'ignition_physics5-install-pkg-focal-amd64', + 'gz_physics-ci-ign-physics5-focal-amd64', + 'gz_physics-ci-ign-physics5-homebrew-amd64', + 'gz_physics5-install-pkg-focal-amd64', 'ignition_physics5-install_bottle-homebrew-amd64', - 'ignition_plugin-ci-ign-plugin1-focal-amd64', - 'ignition_plugin-ci-ign-plugin1-homebrew-amd64', + 'gz_plugin-ci-ign-plugin1-focal-amd64', + 'gz_plugin-ci-ign-plugin1-homebrew-amd64', 'ignition_plugin-install-pkg-focal-amd64', 'ignition_plugin1-install_bottle-homebrew-amd64', - 'ignition_rendering-ci-ign-rendering6-focal-amd64', - 'ignition_rendering-ci-ign-rendering6-homebrew-amd64', - 'ignition_rendering6-install-pkg-focal-amd64', + 'gz_rendering-ci-ign-rendering6-focal-amd64', + 'gz_rendering-ci-ign-rendering6-homebrew-amd64', + 'gz_rendering6-install-pkg-focal-amd64', 'ignition_rendering6-install_bottle-homebrew-amd64', - 'ignition_sensors-ci-ign-sensors6-focal-amd64', - 'ignition_sensors-ci-ign-sensors6-homebrew-amd64', - 'ignition_sensors6-install-pkg-focal-amd64', + 'gz_sensors-ci-ign-sensors6-focal-amd64', + 'gz_sensors-ci-ign-sensors6-homebrew-amd64', + 'gz_sensors6-install-pkg-focal-amd64', 'ignition_sensors6-install_bottle-homebrew-amd64', - 'ignition_tools-ci-ign-tools1-focal-amd64', - 'ignition_tools-ci-ign-tools1-homebrew-amd64', + 'gz_tools-ci-ign-tools1-focal-amd64', + 'gz_tools-ci-ign-tools1-homebrew-amd64', 'ignition_tools-install-pkg-focal-amd64', 'ignition_tools1-install_bottle-homebrew-amd64', - 'ignition_transport-ci-ign-transport11-focal-amd64', - 'ignition_transport-ci-ign-transport11-homebrew-amd64', - 'ignition_transport11-install-pkg-focal-amd64', + 'gz_transport-ci-ign-transport11-focal-amd64', + 'gz_transport-ci-ign-transport11-homebrew-amd64', + 'gz_transport11-install-pkg-focal-amd64', 'ignition_transport11-install_bottle-homebrew-amd64', - 'ignition_utils-ci-ign-utils1-focal-amd64', - 'ignition_utils-ci-ign-utils1-homebrew-amd64', + 'gz_utils-ci-ign-utils1-focal-amd64', + 'gz_utils-ci-ign-utils1-homebrew-amd64', 'ignition_utils-install-pkg-focal-amd64', 'ignition_utils1-install_bottle-homebrew-amd64', - 'sdformat-ci-sdformat12-focal-amd64', - 'sdformat-ci-sdformat12-homebrew-amd64', + 'sdformat-ci-sdf12-focal-amd64', + 'sdformat-ci-sdf12-homebrew-amd64', 'sdformat-install-sdformat12_pkg-focal-amd64', - 'sdformat-sdf-12-win.xml' + 'sdformat-sdf12-win' ], 'garden' : [ 'gz_cmake3-install-pkg-focal-amd64', @@ -207,89 +206,89 @@ gz_collection_jobs = 'gz_transport12-install-pkg-focal-amd64', 'gz_utils2-install-pkg-focal-amd64', 'sdformat-install-sdformat13_pkg-focal-amd64', - 'ign_cmake-gz-3-win', - 'ign_common-gz-5-win', - 'ign_fuel-tools-gz-8-win', - 'ign_gazebo-gz-7-win', - 'ign_gui-gz-7-win', - 'ign_launch-gz-6-win', - 'ign_math-gz-7-win', - 'ign_msgs-gz-9-win', - 'ign_physics-gz-6-win', - 'ign_plugin-gz-2-win', - 'ign_rendering-gz-7-win', - 'ign_sensors-gz-7-win', - 'ign_tools-gz-2-win', - 'ign_transport-gz-12-win', - 'ign_utils-gz-2-win', - 'sdformat-sdf-13-win', - 'ignition_cmake-ci-gz-cmake3-focal-amd64', - 'ignition_cmake-ci-gz-cmake3-homebrew-amd64', + 'gz_cmake-3-win', + 'gz_common-5-win', + 'gz_fuel-tools-8-win', + 'gz_sim-7-win', + 'gz_gui-7-win', + 'gz_launch-6-win', + 'gz_math-7-win', + 'gz_msgs-9-win', + 'gz_physics-6-win', + 'gz_plugin-2-win', + 'gz_rendering-7-win', + 'gz_sensors-7-win', + 'gz_tools-2-win', + 'gz_transport-12-win', + 'gz_utils-2-win', + 'sdformat-sdf13-win', + 'gz_cmake-ci-gz-cmake3-focal-amd64', + 'gz_cmake-ci-gz-cmake3-homebrew-amd64', 'ignition_cmake3-install_bottle-homebrew-amd64', - 'ignition_common-ci-gz-common5-focal-amd64', - 'ignition_common-ci-gz-common5-homebrew-amd64', + 'gz_common-ci-gz-common5-focal-amd64', + 'gz_common-ci-gz-common5-homebrew-amd64', 'ignition_common5-install_bottle-homebrew-amd64', - 'ignition_fuel-tools-ci-gz-fuel-tools8-focal-amd64', - 'ignition_fuel-tools-ci-gz-fuel-tools8-homebrew-amd64', + 'gz_fuel-tools-ci-gz-fuel-tools8-focal-amd64', + 'gz_fuel-tools-ci-gz-fuel-tools8-homebrew-amd64', 'ignition_fuel-tools8-install_bottle-homebrew-amd64', 'ignition_garden-ci-main-homebrew-amd64', 'ignition_garden-install-pkg-focal-amd64', 'ignition_garden-install_bottle-homebrew-amd64', - 'ignition_gazebo-ci-gz-sim7-focal-amd64', - 'ignition_gazebo-ci-gz-sim7-homebrew-amd64', + 'gz_sim-ci-gz-sim7-focal-amd64', + 'gz_sim-ci-gz-sim7-homebrew-amd64', 'ignition_sim7-install_bottle-homebrew-amd64', - 'ignition_gui-ci-gz-gui7-focal-amd64', - 'ignition_gui-ci-gz-gui7-homebrew-amd64', + 'gz_gui-ci-gz-gui7-focal-amd64', + 'gz_gui-ci-gz-gui7-homebrew-amd64', 'ignition_gui6-install_bottle-homebrew-amd64', - 'ignition_launch-ci-gz-launch6-focal-amd64', - 'ignition_launch-ci-gz-launch6-homebrew-amd64', + 'gz_launch-ci-gz-launch6-focal-amd64', + 'gz_launch-ci-gz-launch6-homebrew-amd64', 'ignition_launch6-install_bottle-homebrew-amd64', - 'ignition_math-ci-gz-math7-focal-amd64', - 'ignition_math-ci-gz-math7-homebrew-amd64', + 'gz_math-ci-gz-math7-focal-amd64', + 'gz_math-ci-gz-math7-homebrew-amd64', 'ignition_math7-install_bottle-homebrew-amd64', - 'ignition_msgs-ci-gz-msgs9-focal-amd64', - 'ignition_msgs-ci-gz-msgs9-homebrew-amd64', + 'gz_msgs-ci-gz-msgs9-focal-amd64', + 'gz_msgs-ci-gz-msgs9-homebrew-amd64', 'ignition_msgs9-install_bottle-homebrew-amd64', - 'ignition_physics-ci-gz-physics6-focal-amd64', - 'ignition_physics-ci-gz-physics6-homebrew-amd64', + 'gz_physics-ci-gz-physics6-focal-amd64', + 'gz_physics-ci-gz-physics6-homebrew-amd64', 'ignition_physics6-install_bottle-homebrew-amd64', - 'ignition_plugin-ci-gz-plugin2-focal-amd64', - 'ignition_plugin-ci-gz-plugin2-homebrew-amd64', + 'gz_plugin-ci-gz-plugin2-focal-amd64', + 'gz_plugin-ci-gz-plugin2-homebrew-amd64', 'ignition_plugin2-install_bottle-homebrew-amd64', - 'ignition_rendering-ci-gz-rendering7-focal-amd64', - 'ignition_rendering-ci-gz-rendering7-homebrew-amd64', + 'gz_rendering-ci-gz-rendering7-focal-amd64', + 'gz_rendering-ci-gz-rendering7-homebrew-amd64', 'ignition_rendering7-install_bottle-homebrew-amd64', - 'ignition_sensors-ci-gz-sensors7-focal-amd64', - 'ignition_sensors-ci-gz-sensors7-homebrew-amd64', + 'gz_sensors-ci-gz-sensors7-focal-amd64', + 'gz_sensors-ci-gz-sensors7-homebrew-amd64', 'ignition_sensors7-install_bottle-homebrew-amd64', - 'ignition_tools-ci-gz-tools2-focal-amd64', - 'ignition_tools-ci-gz-tools2-homebrew-amd64', + 'gz_tools-ci-gz-tools2-focal-amd64', + 'gz_tools-ci-gz-tools2-homebrew-amd64', 'ignition_tools2-install_bottle-homebrew-amd64', - 'ignition_transport-ci-gz-transport12-focal-amd64', - 'ignition_transport-ci-gz-transport12-homebrew-amd64', + 'gz_transport-ci-gz-transport12-focal-amd64', + 'gz_transport-ci-gz-transport12-homebrew-amd64', 'ignition_transport12-install_bottle-homebrew-amd64', - 'ignition_utils-ci-gz-utils2-focal-amd64', - 'ignition_utils-ci-gz-utils2-homebrew-amd64', + 'gz_utils-ci-gz-utils2-focal-amd64', + 'gz_utils-ci-gz-utils2-homebrew-amd64', 'ignition_utils2-install_bottle-homebrew-amd64', - 'sdformat-ci-sdformat13-focal-amd64', - 'sdformat-ci-sdformat13-homebrew-amd64' + 'sdformat-ci-sdf13-focal-amd64', + 'sdformat-ci-sdf13-homebrew-amd64' ], 'harmonic' : [ - 'ign_cmake-gz-3-win', - 'ign_common-gz-5-win', - 'ign_fuel-tools-gz-9-win', - 'ign_gazebo-gz-8-win', - 'ign_gui-gz-8-win', - 'ign_launch-gz-7-win', - 'ign_math-gz-7-win', - 'ign_msgs-gz-10-win', - 'ign_physics-gz-7-win', - 'ign_plugin-gz-2-win', - 'ign_rendering-gz-8-win', - 'ign_sensors-gz-8-win', - 'ign_tools-gz-2-win', - 'ign_transport-gz-13-win', - 'ign_utils-gz-2-win', + 'gz_cmake-3-win', + 'gz_common-5-win', + 'gz_fuel-tools-9-win', + 'gz_sim-8-win', + 'gz_gui-8-win', + 'gz_launch-7-win', + 'gz_math-7-win', + 'gz_msgs-10-win', + 'gz_physics-7-win', + 'gz_plugin-2-win', + 'gz_rendering-8-win', + 'gz_sensors-8-win', + 'gz_tools-2-win', + 'gz_transport-13-win', + 'gz_utils-2-win', 'gz_cmake-ci-gz-cmake3-jammy-amd64', 'gz_common-ci-gz-common5-jammy-amd64', 'gz_fuel_tools-ci-gz-fuel-tools9-jammy-amd64', @@ -305,93 +304,93 @@ gz_collection_jobs = 'gz_tools-ci-gz-tools2-jammy-amd64', 'gz_transport-ci-gz-transport13-jammy-amd64', 'gz_utils-ci-gz-utils2-jammy-amd64', - 'ignition_cmake-ci-gz-cmake3-homebrew-amd64', + 'gz_cmake-ci-gz-cmake3-homebrew-amd64', 'ignition_cmake3-install_bottle-homebrew-amd64', - 'ignition_common-ci-gz-common5-homebrew-amd64', + 'gz_common-ci-gz-common5-homebrew-amd64', 'ignition_common5-install_bottle-homebrew-amd64', - 'ignition_fuel-tools-ci-gz-fuel-tools9-homebrew-amd64', + 'gz_fuel-tools-ci-gz-fuel-tools9-homebrew-amd64', 'ignition_fuel-tools9-install_bottle-homebrew-amd64', 'ignition_harmonic-ci-main-homebrew-amd64', 'ignition_harmonic-install_bottle-homebrew-amd64', - 'ignition_gazebo-ci-gz-sim8-homebrew-amd64', + 'gz_sim-ci-gz-sim8-homebrew-amd64', 'ignition_sim8-install_bottle-homebrew-amd64', - 'ignition_gui-ci-gz-gui8-homebrew-amd64', + 'gz_gui-ci-gz-gui8-homebrew-amd64', 'ignition_gui8-install_bottle-homebrew-amd64', - 'ignition_launch-gz-launch7-homebrew-amd64', + 'gz_launch-gz-launch7-homebrew-amd64', 'ignition_launch7-install_bottle-homebrew-amd64', - 'ignition_math-ci-gz-math7-homebrew-amd64', + 'gz_math-ci-gz-math7-homebrew-amd64', 'ignition_math7-install_bottle-homebrew-amd64', - 'ignition_msgs-ci-gz-msgs10-homebrew-amd64', + 'gz_msgs-ci-gz-msgs10-homebrew-amd64', 'ignition_msgs10-install_bottle-homebrew-amd64', - 'ignition_physics-ci-gz-physics7-homebrew-amd64', + 'gz_physics-ci-gz-physics7-homebrew-amd64', 'ignition_physics7-install_bottle-homebrew-amd64', - 'ignition_plugin-ci-gz-plugin2-homebrew-amd64', + 'gz_plugin-ci-gz-plugin2-homebrew-amd64', 'ignition_plugin2-install_bottle-homebrew-amd64', - 'ignition_rendering-ci-gz-rendering8-homebrew-amd64', + 'gz_rendering-ci-gz-rendering8-homebrew-amd64', 'ignition_rendering8-install_bottle-homebrew-amd64', - 'ignition_sensors-ci-gz-sensors8-homebrew-amd64', + 'gz_sensors-ci-gz-sensors8-homebrew-amd64', 'ignition_sensors8-install_bottle-homebrew-amd64', - 'ignition_tools-ci-gz-tools2-homebrew-amd64', + 'gz_tools-ci-gz-tools2-homebrew-amd64', 'ignition_tools2-install_bottle-homebrew-amd64', - 'ignition_transport-ci-gz-transport13-homebrew-amd64', + 'gz_transport-ci-gz-transport13-homebrew-amd64', 'ignition_transport13-install_bottle-homebrew-amd64', - 'ignition_utils-ci-gz-utils2-homebrew-amd64', + 'gz_utils-ci-gz-utils2-homebrew-amd64', 'ignition_utils2-install_bottle-homebrew-amd64', - 'sdformat-ci-sdformat14-jammy-amd64', - 'sdformat-ci-sdformat14-homebrew-amd64', + 'sdformat-ci-sdf14-jammy-amd64', + 'sdformat-ci-sdf14-homebrew-amd64', 'sdformat14-install_bottle-homebrew-amd64', - 'sdformat-sdf-14-win' + 'sdformat-sdf14-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_cmake-main-win', + 'gz_common-main-win', + 'gz_fuel-tools-main-win', + 'gz_gazebo-main-win', + 'gz_gui-main-win', + 'gz_launch-main-win', + 'gz_math-main-win', + 'gz_msgs-main-win', + 'gz_physics-main-win', + 'gz_plugin-main-win', + 'gz_rendering-main-win', + 'gz_sensors-main-win', + 'gz_tools-2-win', + 'gz_transport-main-win', + 'gz_utils-main-win', + 'gz_cmake-ci-main-jammy-amd64', + 'gz_common-ci-main-jammy-amd64', + 'gz_fuel_tools-ci-main-jammy-amd64', + 'gz_gui-ci-main-jammy-amd64', + 'gz_launch-ci-main-jammy-amd64', + 'gz_math-ci-main-jammy-amd64', + 'gz_msgs-ci-main-jammy-amd64', + 'gz_physics-ci-main-jammy-amd64', + 'gz_plugin-ci-main-jammy-amd64', + 'gz_rendering-ci-main-jammy-amd64', + 'gz_sensors-ci-main-jammy-amd64', + 'gz_sim-ci-main-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' + 'gz_transport-ci-main-jammy-amd64', + 'gz_utils-ci-main-jammy-amd64', + 'gz_cmake-ci-main-homebrew-amd64', + 'gz_common-ci-main-homebrew-amd64', + 'gz_fuel-tools-ci-main-homebrew-amd64', + 'gz_ionic-ci-main-homebrew-amd64', + 'gz_sim-ci-main-homebrew-amd64', + 'gz_gui-ci-main-homebrew-amd64', + 'gz_launch-ci-main-homebrew-amd64', + 'gz_math-ci-main-homebrew-amd64', + 'gz_msgs-ci-main-homebrew-amd64', + 'gz_physics-ci-main-homebrew-amd64', + 'gz_plugin-ci-main-homebrew-amd64', + 'gz_rendering-ci-main-homebrew-amd64', + 'gz_sensors-ci-main-homebrew-amd64', + 'gz_tools-ci-gz-tools2-homebrew-amd64', + 'gz_transport-ci-main-homebrew-amd64', + 'gz_utils-ci-main-homebrew-amd64', + 'sdformat-ci-main-jammy-amd64', + 'sdformat-ci-main-homebrew-amd64', + 'sdformat-main-win' ], ] From 22a5fd68aa2c55b27f41f52d4b28e0dc18462308 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 28 Nov 2023 16:24:28 +0100 Subject: [PATCH 3/8] Increase priority for all PR jobs (#1077) Overwrite it to 200 going after release builders but before other CI runs. Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/_configs_/GenericAnyJobGitHub.groovy | 9 +++++++++ jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/dsl/_configs_/GenericAnyJobGitHub.groovy b/jenkins-scripts/dsl/_configs_/GenericAnyJobGitHub.groovy index e6d96d143..2939a3b92 100644 --- a/jenkins-scripts/dsl/_configs_/GenericAnyJobGitHub.groovy +++ b/jenkins-scripts/dsl/_configs_/GenericAnyJobGitHub.groovy @@ -4,6 +4,7 @@ import javaposse.jobdsl.dsl.Job /* Implements: + - priority 200 - parameters: SRC_REPO, SRC_BRANCH, JOB_DESCRIPTION - job.Description - scm check with SRC_REPO + SRC_BRANCH @@ -33,6 +34,14 @@ class GenericAnyJobGitHub job.with { + // Overrwrite the priority set by other classes + configure { project -> + project / 'properties' / 'jenkins.advancedqueue.priority.strategy.PriorityJobProperty' { + 'useJobPriority'(true) + 'priority'(200) + } + } + parameters { stringParam('sha1', 'main', 'commit or refname to build. To manually use a branch: origin/$branch_name') diff --git a/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy b/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy index d21fd655e..b0bba9ed6 100644 --- a/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy +++ b/jenkins-scripts/dsl/_configs_/OSRFLinuxABIGitHub.groovy @@ -6,7 +6,7 @@ import javaposse.jobdsl.dsl.Job -> OSRFLinuxBase Implements: - - priority 300 + - priority 200 - logrotator - concurrent builds - parameter: DEST_BRANCH, SRC_BRANCH @@ -35,7 +35,7 @@ class OSRFLinuxABIGitHub job.with { properties { - priority 300 + priority 200 } logRotator { From 460240b58cc3963a951fb9e490f8e49567c593c0 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 28 Nov 2023 17:40:28 +0100 Subject: [PATCH 4/8] Change output in release.py to be more user friendly (#1074) * Introduce print_dbg and use it to hide main debug command * Improve output and added a header and downloading * Use debug info in check_releasepy * Display help in source calls for the user * Use search params for brew and builders --------- Signed-off-by: Jose Luis Rivero --- check_releasepy.bash | 1 + release.py | 84 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 68 insertions(+), 17 deletions(-) diff --git a/check_releasepy.bash b/check_releasepy.bash index 5e71fb168..a7c07a222 100755 --- a/check_releasepy.bash +++ b/check_releasepy.bash @@ -3,6 +3,7 @@ test_dir=$(mktemp -d) mkdir -p ${test_dir}/{focal,jammy,ubuntu}/debian export _RELEASEPY_TEST_RELEASE_REPO=${test_dir} +export _RELEASEPY_DEBUG=1 exec_releasepy_test() { diff --git a/release.py b/release.py index db1bd2c35..56ca9c5b5 100755 --- a/release.py +++ b/release.py @@ -73,6 +73,11 @@ def print_success(msg): print(" + OK " + msg) +def print_only_dbg(msg): + if '_RELEASEPY_DEBUG' in os.environ: + print(msg) + + # Remove the last character if it is a number. # That should leave just the package name instead of packageVersion # I.E gazebo5 -> gazebo @@ -370,19 +375,19 @@ def discover_distros(repo_dir): arches_supported = [x for x in SUPPORTED_ARCHS if x not in excluded_arches] distro_arch_list[d] = arches_supported - print('Distributions in release-repo:') - for k in distro_arch_list: - print("- " + k + " (" + ', '.join(distro_arch_list[k]) + ")") + print('Linux distributions in the -release repository:') + for distro in distro_arch_list: + print(f" + {distro} {*distro_arch_list[distro],}") return distro_arch_list def check_call(cmd, ignore_dry_run=False): if DRY_RUN and not ignore_dry_run: - print('Dry-run running:\n %s\n' % (' '.join(cmd))) + print_only_dbg('Dry-run running:\n %s\n' % (' '.join(cmd))) return b'', b'' else: - print('Running:\n %s' % (' '.join(cmd))) + print_only_dbg('Running:\n %s' % (' '.join(cmd))) po = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = po.communicate() if po.returncode != 0: @@ -433,7 +438,7 @@ def generate_source_repository_uri(args): out, err = check_call(['git', 'ls-remote', '--get-url', 'origin'], IGNORE_DRY_RUN) if err: - print(f"An error happened running git ls-remote: ${err}") + print(f"An error happened running git ls-remote: {err}") sys.exit(1) git_remote = out.decode().split('\n')[0] @@ -469,16 +474,46 @@ def generate_source_params(args): return params -def call_jenkins_build(job_name, params, output_string): +def call_jenkins_build(job_name, params, output_string, + search_description_help): + # Only to help user feedback this block + help_url = f'{JENKINS_URL}/job/{job_name}' + if search_description_help: + search_param = urllib.parse.urlencode( + {'search': search_description_help}) + help_url += f'?{search_param}' + print(f" + Releasing {output_string} in {help_url}") + # Real action happen here params_query = urllib.parse.urlencode(params) url = '%s/job/%s/buildWithParameters?%s' % (JENKINS_URL, job_name, params_query) - print(f"- {output_string}: {url}") + print_only_dbg(f" -- {output_string}: {url}") if not DRY_RUN: urllib.request.urlopen(url) +def display_help_job_chain_for_source_calls(args): + # Encode the different ways using in the job descriptions to filter builds + # - "package version" in repository_uploader_packages + # - "packages/version-rev" in _releasepy + url_search_params = urllib.parse.urlencode( + {'search': + f'{args.package_alias} {args.version}'}) + pkgs_upload_check_url = \ + f'{JENKINS_URL}/job/repository_uploader_packages/?{url_search_params}' + rel_search_params = urllib.parse.urlencode( + {'search': + f'{args.package_alias}/{args.version}-{args.release_version}'}) + releasepy_check_url = \ + f'{JENKINS_URL}/job/_releasepy/?{rel_search_params}' + print('\tINFO: After the source job finished, the release process will trigger:\n' + '\t * Source upload:' + f'{pkgs_upload_check_url}\n' + '\t * Builders using release.py --source-tarball-uri:' + f'{releasepy_check_url}') + + def go(argv): args = parse_args(argv) @@ -486,6 +521,7 @@ def go(argv): if not args.release_version: args.release_version = 1 + print(f"Downloading releasing info for {args.package}") # Sanity checks and dicover supported distributions before proceed. repo_dir, args.release_repo_branch = download_release_repository(args.package, args.release_repo_branch) # The supported distros are the ones in the top level of -release repo @@ -507,13 +543,17 @@ def go(argv): if args.extra_repo: params['OSRF_REPOS_TO_USE'] += " " + args.extra_repo - + if args.dry_run: + print("Simulation of jobs to be called if not dry-run:") + else: + print("Triggering release jobs:") # a) Mode nightly or builders: if NIGHTLY or args.source_tarball_uri: # RELEASING FOR BREW if not NIGHTLY and not args.bump_rev_linux_only: call_jenkins_build(GENERIC_BREW_PULLREQUEST_JOB, - params, 'Brew') + params, 'Brew', + f'{args.package_alias}-{args.version}') # RELEASING FOR LINUX for l in LINUX_DISTROS: if (l == 'ubuntu'): @@ -553,15 +593,21 @@ def go(argv): # control nightly generation using a single machine to process # all distribution builds to avoid race conditions. Note: this - # assumes that large-memory nodes are beind used for nightly + # assumes that large-memory nodes are being used for nightly # tags. # https://github.com/gazebo-tooling/release-tools/issues/644 if (NIGHTLY): assert a == 'amd64', f'Nightly tag assumed amd64 but arch is {a}' linux_platform_params['JENKINS_NODE_TAG'] = 'linux-nightly-' + d - + # TODO: last parameter of providing help for -debbuilders + # does not currently work. Somehow the string composed by + # "-()" do not work even in the web UI directly. Real + # string should be: + # f"{args.version}-{args.release_version}({l}/{d}::{a})") call_jenkins_build(f"{args.package_alias}-debbuilder", - linux_platform_params, f"{l} {d}/{a}") + linux_platform_params, + f"{l} {d}/{a}", + f"{args.version}-{args.release_version}") else: # b) Mode generate source # Choose platform to run gz-source on. It will need to install gz-cmake @@ -579,14 +625,18 @@ def go(argv): # Tag should not go before any method or step that can fail and just # before the calls to the servers. if not args.source_repo_ref: - print('INFO: no --source-repo-existing-ref used, tag the local' - 'repository as the reference for the source code of the' - 'release') + print(' * INFO: no --source-repo-existing-ref used, tag the local' + ' repository as the reference for the source code of the' + ' release') params['SOURCE_REPO_REF'] = tag_repo(args) \ if not args.source_repo_ref else args.source_repo_ref - call_jenkins_build(f"{args.package_alias}-source", params, 'Source') + call_jenkins_build(f"{args.package_alias}-source", + params, + 'Source', + args.version) + display_help_job_chain_for_source_calls(args) if __name__ == '__main__': From de8ac8a786b69fca03fc7a1cae5407fa85731eba Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 29 Nov 2023 19:05:22 +0100 Subject: [PATCH 5/8] Split CI: releasepy checks (#1085) Signed-off-by: Jose Luis Rivero --- .github/workflows/ci-releasepy.yaml | 18 ++++++++++++++++++ .github/workflows/ci.yaml | 2 -- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/ci-releasepy.yaml diff --git a/.github/workflows/ci-releasepy.yaml b/.github/workflows/ci-releasepy.yaml new file mode 100644 index 000000000..fa9f0c9c7 --- /dev/null +++ b/.github/workflows/ci-releasepy.yaml @@ -0,0 +1,18 @@ +name: Releasing tests + +on: + push: + paths: + - release.py + +jobs: + dsl_ci: + runs-on: ubuntu-latest + name: release.py checks + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Run release.py script tests + run: ./check_releasepy.bash diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 524dd498f..caa9d6c1d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,8 +40,6 @@ jobs: with: distribution: 'temurin' java-version: '11' - - name: Run release.py script tests - run: ./check_releasepy.bash - name: Download and setup job dsl jar if: steps.dsl_check.outputs.run_job == 'true' run: ./jenkins-scripts/dsl/tools/setup_local_generation.bash From 2b92f844a4b1c3331f0c6056963ed63e4e936456 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 30 Nov 2023 12:22:09 +0100 Subject: [PATCH 6/8] Change Citadel CI: from Bionic to Focal and change name from ign_ to use gz_ (#1083) * Move Citadel to use gz and Focal * Remove bionic from packaging Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 92 +++++++------------------ 1 file changed, 23 insertions(+), 69 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 300235db5..50addd304 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -28,31 +28,31 @@ spec_version: 0 collections: - name: 'citadel' libs: - - name: ign-cmake + - name: gz-cmake major_version: 2 repo: current_branch: ign-cmake2 - - name: ign-tools + - name: gz-tools major_version: 1 repo: current_branch: ign-tools1 - - name: ign-math + - name: gz-math major_version: 6 repo: current_branch: ign-math6 - - name: ign-plugin + - name: gz-plugin major_version: 1 repo: current_branch: ign-plugin1 - - name: ign-common + - name: gz-common major_version: 3 repo: current_branch: ign-common3 - - name: ign-msgs + - name: gz-msgs major_version: 5 repo: current_branch: ign-msgs5 - - name: ign-rendering + - name: gz-rendering major_version: 3 repo: current_branch: ign-rendering3 @@ -60,49 +60,49 @@ collections: major_version: 9 repo: current_branch: sdf9 - - name: ign-fuel-tools + - name: gz-fuel-tools major_version: 4 repo: current_branch: ign-fuel-tools4 - - name: ign-transport + - name: gz-transport major_version: 8 repo: current_branch: ign-transport8 - - name: ign-gui + - name: gz-gui major_version: 3 repo: current_branch: ign-gui3 - - name: ign-sensors + - name: gz-sensors major_version: 3 repo: current_branch: ign-sensors3 - - name: ign-physics + - name: gz-physics major_version: 2 repo: current_branch: ign-physics2 - - name: ign-gazebo - major_version: 7 + - name: gz-sim + major_version: 3 repo: current_branch: ign-gazebo3 - - name: ign-launch + - name: gz-launch major_version: 2 repo: current_branch: ign-launch2 - - name: ign-citadel + - name: gz-citadel major_version: 1 repo: current_branch: main ci: configs: - - bionic + - focal - brew - win packaging: configs: - - bionic + - focal linux: ignore_major_version: - - ign-citadel + - gz-citadel - name: 'fortress' libs: - name: gz-cmake @@ -443,30 +443,6 @@ collections: exclude: - __upcoming__ ci_configs: - - name: bionic - system: - so: linux - distribution: ubuntu - version: bionic - arch: amd64 - exclude: - all: - - ign-citadel - abichecker: - - ign-cmake - - ign-tools - requirements: - large_memory: - - ign-physics - nvidia_gpu: - - ign-gazebo - - ign-gui - - ign-rendering - - ign-sensors - pre_setup_script_hook: - gz-physics: - - "export MAKE_JOBS=1" - tests_disabled: - name: focal system: so: linux @@ -483,6 +459,7 @@ ci_configs: - gz-sensors exclude: all: + - gz-citadel - gz-fortress - gz-garden abichecker: @@ -494,7 +471,7 @@ ci_configs: - gz-plugin - gz-utils pre_setup_script_hook: - ign-physics: + gz-physics: - "export MAKE_JOBS=1" tests_disabled: - name: jammy @@ -531,7 +508,7 @@ ci_configs: requirements: exclude: all: - - ign-citadel + - gz-citadel - gz-fortress - gz-garden - gz-harmonic @@ -562,7 +539,7 @@ ci_configs: requirements: exclude: all: - - ign-citadel + - gz-citadel - gz-fortress - gz-garden - gz-harmonic @@ -583,31 +560,8 @@ ci_configs: - gz-tools - gz-transport - gz-utils - - ign-cmake - - ign-common - - ign-fuel-tools - - ign-sim - - ign-gui - - ign-launch - - ign-math - - ign-msgs - - ign-physics - - ign-rendering - - ign-sensors - - ign-tools - - ign-transport - - ign-utils - sdformat packaging_configs: - - name: bionic - system: - so: linux - distribution: ubuntu - version: bionic - arch: - - i386 - - amd64 - - arm64 - name: focal system: so: linux From d468bd268b8de64268f107f453bc39df5b66c99f Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 30 Nov 2023 16:55:20 +0100 Subject: [PATCH 7/8] Clean up DSL CI by using GitHub actions paths (#1086) Signed-off-by: Jose Luis Rivero --- .github/workflows/ci.yaml | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index caa9d6c1d..8539f9ba4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,9 @@ -name: CI +name: DSL logs and checks -# base_ref / head_reaf are only available in PRs -on: [pull_request] +on: + pull_request: + paths: + - 'jenkins-scripts/dsl/**' jobs: dsl_ci: @@ -12,39 +14,17 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Idenfify files changed in this PR - id: files - run: | - git fetch origin ${{ github.ref }} - git diff --name-only origin/${{ github.base_ref }}...FETCH_HEAD - echo "changed-files=$(git diff --name-only origin/${{ github.base_ref }}...FETCH_HEAD| tr '\n' ' ')" >> $GITHUB_OUTPUT - - name: Run testing on changed config files - id: dsl_check - run: | - for changed_file in ${{ steps.files.outputs.changed-files }}; do - if [[ ${changed_file} != ${changed_file/dsl\/*} ]]; then - echo "+ Detected at leat one config file: ${changed_file}." - echo "run_job=true" >> $GITHUB_OUTPUT - break - else - echo "run_job=false" >> $GITHUB_OUTPUT - fi - done - name: Checkout - if: steps.dsl_check.outputs.run_job == 'true' uses: actions/checkout@v3 with: fetch-depth: 2 - uses: actions/setup-java@v3 - if: steps.dsl_check.outputs.run_job == 'true' with: distribution: 'temurin' java-version: '11' - name: Download and setup job dsl jar - if: steps.dsl_check.outputs.run_job == 'true' run: ./jenkins-scripts/dsl/tools/setup_local_generation.bash - name: Generate all DSL files - if: steps.dsl_check.outputs.run_job == 'true' run: | # simulate token for brew_release sudo mkdir -p /var/lib/jenkins/ && sudo touch /var/lib/jenkins/remote_token @@ -52,12 +32,10 @@ jobs: cd jenkins-scripts/dsl WRITE_JOB_LOG=1 java -jar tools/jobdsl.jar *.dsl - name: Checks for DSL Code - if: steps.dsl_check.outputs.run_job == 'true' run: | cd jenkins-scripts/dsl ./dsl_checks.bash - name: Export XML generated configuration for diff - if: steps.dsl_check.outputs.run_job == 'true' run: | cd jenkins-scripts/dsl # export files for later diff @@ -67,7 +45,6 @@ jobs: mv *.xml /tmp/pr_xml_configuration/ mv *.txt /tmp/pr_log_generated/ - name: Generate master DSL files - if: steps.dsl_check.outputs.run_job == 'true' run: | git clean -f -e jobdsl.jar git checkout master @@ -79,26 +56,22 @@ jobs: mv *.xml /tmp/current_xml_configuration/ mv *.txt /tmp/current_log_generated/ || true - name: Generating diffs - if: steps.dsl_check.outputs.run_job == 'true' run: | # somehow the Jenkins views changed the portlet_ id on every run. diff -qr -I '.*dashboard_portlet_.*.*' /tmp/current_xml_configuration /tmp/pr_xml_configuration | sort > /tmp/xml_config_files_changed.diff || true diff -ur -I '.*dashboard_portlet_.*.*' /tmp/current_xml_configuration /tmp/pr_xml_configuration > /tmp/xml_config_content_changed.diff || true diff -ur /tmp/current_log_generated /tmp/pr_log_generated > /tmp/log_content_changed.diff || true - name: Archive files changes - if: steps.dsl_check.outputs.run_job == 'true' uses: actions/upload-artifact@v3 with: name: xml_config_files_changed path: /tmp/xml_config_files_changed.diff - name: Archive content changes - if: steps.dsl_check.outputs.run_job == 'true' uses: actions/upload-artifact@v3 with: name: xml_config_content_changed path: /tmp/xml_config_content_changed.diff - name: Archive log changes - if: steps.dsl_check.outputs.run_job == 'true' uses: actions/upload-artifact@v3 with: name: log_content_changed From b07a489af3259cc8f339482bff81a261565b21f7 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 30 Nov 2023 17:20:32 +0100 Subject: [PATCH 8/8] Update dashboard for changes in Citadel (#1087) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/ignition_collection.dsl | 86 ++++++++++----------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index 660bb8b58..61fa50036 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -27,79 +27,79 @@ String get_debbuilder_name(parsed_yaml_lib, parsed_yaml_packaging) gz_collection_jobs = [ 'citadel' : [ - 'ign_cmake-2-win', - 'ign_common-3-win', - 'ign_fuel-tools-4-win', - 'ign_gazebo-3-win', - 'ign_gui-3-win', - 'ign_math-6-win', - 'ign_msgs-5-win', - 'ign_physics-2-win', - 'ign_plugin-1-win', - 'ign_rendering-3-win', - 'ign_sensors-3-win', - 'ign_tools-1-win', - 'ign_transport-8-win', + 'gz_cmake-2-win', + 'gz_common-3-win', + 'gz_fuel_tools-4-win', + 'gz_gazebo-3-win', + 'gz_gui-3-win', + 'gz_math-6-win', + 'gz_msgs-5-win', + 'gz_physics-2-win', + 'gz_plugin-1-win', + 'gz_rendering-3-win', + 'gz_sensors-3-win', + 'gz_tools-1-win', + 'gz_transport-8-win', 'ignition_citadel-ci-main-homebrew-amd64', - 'ignition_citadel-install-pkg-bionic-amd64', + 'ignition_citadel-install-pkg-focal-amd64', 'ignition_citadel-install_bottle-homebrew-amd64', - 'ign_cmake-ci-ign-cmake2-bionic-amd64', - 'ign_cmake-ci-ign-cmake2-homebrew-amd64', + 'gz_cmake-ci-ign-cmake2-focal-amd64', + 'gz_cmake-ci-ign-cmake2-homebrew-amd64', 'ignition_cmake2-install-pkg-focal-amd64', 'ignition_cmake2-install_bottle-homebrew-amd64', - 'ign_common-ci-ign-common3-bionic-amd64', - 'ign_common-ci-ign-common3-homebrew-amd64', + 'gz_common-ci-ign-common3-focal-amd64', + 'gz_common-ci-ign-common3-homebrew-amd64', 'ignition_common3-install-pkg-focal-amd64', 'ignition_common3-install_bottle-homebrew-amd64', - 'ign_fuel-tools-ci-ign-fuel-tools4-bionic-amd64', - 'ign_fuel-tools-ci-ign-fuel-tools4-homebrew-amd64', + 'gz_fuel_tools-ci-ign-fuel-tools4-focal-amd64', + 'gz_fuel_tools-ci-ign-fuel-tools4-homebrew-amd64', 'ignition_fuel-tools4-install-pkg-focal-amd64', 'ignition_fuel-tools4-install_bottle-homebrew-amd64', - 'ign_gazebo-ci-ign-gazebo3-bionic-amd64', - 'ign_gazebo-ci-ign-gazebo3-homebrew-amd64', + 'gz_gazebo-ci-ign-gazebo3-focal-amd64', + 'gz_gazebo-ci-ign-gazebo3-homebrew-amd64', 'ignition_gazebo3-install-pkg-focal-amd64', 'ignition_gazebo3-install_bottle-homebrew-amd64', - 'ign_gui-ci-ign-gui3-bionic-amd64', - 'ign_gui-ci-ign-gui3-homebrew-amd64', + 'gz_gui-ci-ign-gui3-focal-amd64', + 'gz_gui-ci-ign-gui3-homebrew-amd64', 'ignition_gui3-install-pkg-focal-amd64', 'ignition_gui3-install_bottle-homebrew-amd64', - 'ign_launch-ci-ign-launch2-bionic-amd64', - 'ign_launch-ci-ign-launch2-homebrew-amd64', + 'gz_launch-ci-ign-launch2-focal-amd64', + 'gz_launch-ci-ign-launch2-homebrew-amd64', 'ignition_launch2-install-pkg-focal-amd64', 'ignition_launch2-install_bottle-homebrew-amd64', - 'ign_math-ci-ign-math6-bionic-amd64', - 'ign_math-ci-ign-math6-homebrew-amd64', + 'gz_math-ci-ign-math6-focal-amd64', + 'gz_math-ci-ign-math6-homebrew-amd64', 'ignition_math6-install-pkg-focal-amd64', 'ignition_math6-install_bottle-homebrew-amd64', - 'ign_msgs-ci-ign-msgs5-bionic-amd64', - 'ign_msgs-ci-ign-msgs5-homebrew-amd64', + 'gz_msgs-ci-ign-msgs5-focal-amd64', + 'gz_msgs-ci-ign-msgs5-homebrew-amd64', 'ignition_msgs5-install-pkg-focal-amd64', 'ignition_msgs5-install_bottle-homebrew-amd64', - 'ign_physics-ci-ign-physics2-bionic-amd64', - 'ign_physics-ci-ign-physics2-homebrew-amd64', + 'gz_physics-ci-ign-physics2-focal-amd64', + 'gz_physics-ci-ign-physics2-homebrew-amd64', 'ignition_physics2-install-pkg-focal-amd64', 'ignition_physics2-install_bottle-homebrew-amd64', - 'ign_plugin-ci-ign-plugin1-bionic-amd64', - 'ign_plugin-ci-ign-plugin1-homebrew-amd64', + 'gz_plugin-ci-ign-plugin1-focal-amd64', + 'gz_plugin-ci-ign-plugin1-homebrew-amd64', 'ignition_plugin-install-pkg-focal-amd64', 'ignition_plugin1-install_bottle-homebrew-amd64', - 'ign_rendering-ci-ign-rendering3-bionic-amd64', - 'ign_rendering-ci-ign-rendering3-homebrew-amd64', + 'gz_rendering-ci-ign-rendering3-focal-amd64', + 'gz_rendering-ci-ign-rendering3-homebrew-amd64', 'ignition_rendering3-install-pkg-focal-amd64', 'ignition_rendering3-install_bottle-homebrew-amd64', - 'ign_sensors-ci-ign-sensors3-bionic-amd64', - 'ign_sensors-ci-ign-sensors3-homebrew-amd64', + 'gz_sensors-ci-ign-sensors3-focal-amd64', + 'gz_sensors-ci-ign-sensors3-homebrew-amd64', 'ignition_sensors3-install-pkg-focal-amd64', 'ignition_sensors3-install_bottle-homebrew-amd64', - 'ign_tools-ci-ign-tools1-bionic-amd64', - 'ign_tools-ci-ign-tools1-homebrew-amd64', + 'gz_tools-ci-ign-tools1-focal-amd64', + 'gz_tools-ci-ign-tools1-homebrew-amd64', 'ignition_tools-install-pkg-focal-amd64', 'ignition_tools1-install_bottle-homebrew-amd64', - 'ign_transport-ci-ign-transport8-bionic-amd64', - 'ign_transport-ci-ign-transport8-homebrew-amd64', + 'gz_transport-ci-ign-transport8-focal-amd64', + 'gz_transport-ci-ign-transport8-homebrew-amd64', 'ignition_transport8-install-pkg-focal-amd64', 'ignition_transport8-install_bottle-homebrew-amd64', - 'sdformat-ci-sdf9-bionic-amd64', + 'sdformat-ci-sdf9-focal-amd64', 'sdformat-ci-sdf9-homebrew-amd64', 'sdformat-install-sdformat9_pkg-focal-amd64', 'sdformat-sdf9-win'