From 6d0972bd0f6a34adea6897f25a168ff91a17713c Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 31 Jul 2024 16:34:45 +0200 Subject: [PATCH] Rework brew install pkgs and add Fortress/Garden jammy (gz-collections.yaml) * Missing Fortress/Garden jammy packaging in gz-collections.yaml * Fix brew install bottle packages --------- Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 30 +++++++++--------- jenkins-scripts/dsl/gz-collections.yaml | 15 +++++++++ jenkins-scripts/dsl/logs/generated_jobs.txt | 34 +++++++++++++++++++++ 3 files changed, 65 insertions(+), 14 deletions(-) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index b56f6b99c..5ecd6a915 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -560,23 +560,25 @@ pkgconf_per_src_index.each { pkg_src, pkg_src_configs -> def pkg_system = pkg_config.system // - CI-INSTALL jobs ------------------------------------------------ pkg_system.arch.each { arch -> - def linux_install_job_name = generate_linux_install( - pkg_src, - canonical_lib_name, - pkg_system.version, - arch) - def brew_install_job_name = generate_brew_install( - pkg_src, - canonical_lib_name, - arch) - + def install_job_name = "" + if (pkg_system.so == 'linux') { + install_job_name = generate_linux_install( + pkg_src, + canonical_lib_name, + pkg_system.version, + arch) + } else if (pkg_system.so == 'darwin') { + install_job_name = generate_brew_install( + pkg_src, + canonical_lib_name, + arch) + } else { + assert("Unexpected pkg_system.so: " + pkg_system.so) + } pkg_src_config.getValue().each { index_entry -> logging_list['install_ci'].add( [collection: index_entry.collection, - job_name: linux_install_job_name]) - logging_list['install_ci'].add( - [collection: index_entry.collection, - job_name: brew_install_job_name]) + job_name: install_job_name]) } } } diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 7dc3f4f3c..fb1d3a832 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -100,6 +100,7 @@ collections: packaging: configs: - focal + - brew linux: ignore_major_version: - gz-citadel @@ -181,6 +182,8 @@ collections: packaging: configs: - focal + - jammy + - brew linux: ignore_major_version: - gz-fortress @@ -262,6 +265,8 @@ collections: packaging: configs: - focal + - jammy + - brew linux: ignore_major_version: - gz-garden @@ -344,6 +349,7 @@ collections: packaging: configs: - jammy + - brew linux: ignore_major_version: - gz-harmonic @@ -425,6 +431,7 @@ collections: packaging: configs: - noble + - brew linux: ignore_major_version: - gz-ionic @@ -445,6 +452,7 @@ collections: packaging: configs: - noble + - brew ci_configs: - name: focal system: @@ -734,3 +742,10 @@ packaging_configs: - "export MAKE_JOBS=1" exclude: - __upcoming__ + - name: brew + system: + so: darwin + distribution: macOSX + version: all + arch: + - amd64 diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index a41368dcf..0db7b0497 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -367,72 +367,106 @@ install_ci citadel gz_transport8-install_bottle-homebrew-amd64 install_ci citadel sdformat9-install-pkg-focal-amd64 install_ci citadel sdformat9-install_bottle-homebrew-amd64 install_ci fortress gz_cmake2-install-pkg-focal-amd64 +install_ci fortress gz_cmake2-install-pkg-jammy-amd64 install_ci fortress gz_cmake2-install_bottle-homebrew-amd64 install_ci fortress gz_common4-install-pkg-focal-amd64 +install_ci fortress gz_common4-install-pkg-jammy-amd64 install_ci fortress gz_common4-install_bottle-homebrew-amd64 install_ci fortress gz_fortress-install-pkg-focal-amd64 +install_ci fortress gz_fortress-install-pkg-jammy-amd64 install_ci fortress gz_fortress-install_bottle-homebrew-amd64 install_ci fortress gz_fuel_tools7-install-pkg-focal-amd64 +install_ci fortress gz_fuel_tools7-install-pkg-jammy-amd64 install_ci fortress gz_fuel_tools7-install_bottle-homebrew-amd64 install_ci fortress gz_gui6-install-pkg-focal-amd64 +install_ci fortress gz_gui6-install-pkg-jammy-amd64 install_ci fortress gz_gui6-install_bottle-homebrew-amd64 install_ci fortress gz_launch5-install-pkg-focal-amd64 +install_ci fortress gz_launch5-install-pkg-jammy-amd64 install_ci fortress gz_launch5-install_bottle-homebrew-amd64 install_ci fortress gz_math6-install-pkg-focal-amd64 +install_ci fortress gz_math6-install-pkg-jammy-amd64 install_ci fortress gz_math6-install_bottle-homebrew-amd64 install_ci fortress gz_msgs8-install-pkg-focal-amd64 +install_ci fortress gz_msgs8-install-pkg-jammy-amd64 install_ci fortress gz_msgs8-install_bottle-homebrew-amd64 install_ci fortress gz_physics5-install-pkg-focal-amd64 +install_ci fortress gz_physics5-install-pkg-jammy-amd64 install_ci fortress gz_physics5-install_bottle-homebrew-amd64 install_ci fortress gz_plugin1-install-pkg-focal-amd64 +install_ci fortress gz_plugin1-install-pkg-jammy-amd64 install_ci fortress gz_plugin1-install_bottle-homebrew-amd64 install_ci fortress gz_rendering6-install-pkg-focal-amd64 +install_ci fortress gz_rendering6-install-pkg-jammy-amd64 install_ci fortress gz_rendering6-install_bottle-homebrew-amd64 install_ci fortress gz_sensors6-install-pkg-focal-amd64 +install_ci fortress gz_sensors6-install-pkg-jammy-amd64 install_ci fortress gz_sensors6-install_bottle-homebrew-amd64 install_ci fortress gz_sim6-install-pkg-focal-amd64 +install_ci fortress gz_sim6-install-pkg-jammy-amd64 install_ci fortress gz_sim6-install_bottle-homebrew-amd64 install_ci fortress gz_tools1-install-pkg-focal-amd64 +install_ci fortress gz_tools1-install-pkg-jammy-amd64 install_ci fortress gz_tools1-install_bottle-homebrew-amd64 install_ci fortress gz_transport11-install-pkg-focal-amd64 +install_ci fortress gz_transport11-install-pkg-jammy-amd64 install_ci fortress gz_transport11-install_bottle-homebrew-amd64 install_ci fortress gz_utils1-install-pkg-focal-amd64 +install_ci fortress gz_utils1-install-pkg-jammy-amd64 install_ci fortress gz_utils1-install_bottle-homebrew-amd64 install_ci fortress sdformat12-install-pkg-focal-amd64 +install_ci fortress sdformat12-install-pkg-jammy-amd64 install_ci fortress sdformat12-install_bottle-homebrew-amd64 install_ci garden gz_cmake3-install-pkg-focal-amd64 +install_ci garden gz_cmake3-install-pkg-jammy-amd64 install_ci garden gz_cmake3-install_bottle-homebrew-amd64 install_ci garden gz_common5-install-pkg-focal-amd64 +install_ci garden gz_common5-install-pkg-jammy-amd64 install_ci garden gz_common5-install_bottle-homebrew-amd64 install_ci garden gz_fuel_tools8-install-pkg-focal-amd64 +install_ci garden gz_fuel_tools8-install-pkg-jammy-amd64 install_ci garden gz_fuel_tools8-install_bottle-homebrew-amd64 install_ci garden gz_garden-install-pkg-focal-amd64 +install_ci garden gz_garden-install-pkg-jammy-amd64 install_ci garden gz_garden-install_bottle-homebrew-amd64 install_ci garden gz_gui7-install-pkg-focal-amd64 +install_ci garden gz_gui7-install-pkg-jammy-amd64 install_ci garden gz_gui7-install_bottle-homebrew-amd64 install_ci garden gz_launch6-install-pkg-focal-amd64 +install_ci garden gz_launch6-install-pkg-jammy-amd64 install_ci garden gz_launch6-install_bottle-homebrew-amd64 install_ci garden gz_math7-install-pkg-focal-amd64 +install_ci garden gz_math7-install-pkg-jammy-amd64 install_ci garden gz_math7-install_bottle-homebrew-amd64 install_ci garden gz_msgs9-install-pkg-focal-amd64 +install_ci garden gz_msgs9-install-pkg-jammy-amd64 install_ci garden gz_msgs9-install_bottle-homebrew-amd64 install_ci garden gz_physics6-install-pkg-focal-amd64 +install_ci garden gz_physics6-install-pkg-jammy-amd64 install_ci garden gz_physics6-install_bottle-homebrew-amd64 install_ci garden gz_plugin2-install-pkg-focal-amd64 +install_ci garden gz_plugin2-install-pkg-jammy-amd64 install_ci garden gz_plugin2-install_bottle-homebrew-amd64 install_ci garden gz_rendering7-install-pkg-focal-amd64 +install_ci garden gz_rendering7-install-pkg-jammy-amd64 install_ci garden gz_rendering7-install_bottle-homebrew-amd64 install_ci garden gz_sensors7-install-pkg-focal-amd64 +install_ci garden gz_sensors7-install-pkg-jammy-amd64 install_ci garden gz_sensors7-install_bottle-homebrew-amd64 install_ci garden gz_sim7-install-pkg-focal-amd64 +install_ci garden gz_sim7-install-pkg-jammy-amd64 install_ci garden gz_sim7-install_bottle-homebrew-amd64 install_ci garden gz_tools2-install-pkg-focal-amd64 +install_ci garden gz_tools2-install-pkg-jammy-amd64 install_ci garden gz_tools2-install_bottle-homebrew-amd64 install_ci garden gz_transport12-install-pkg-focal-amd64 +install_ci garden gz_transport12-install-pkg-jammy-amd64 install_ci garden gz_transport12-install_bottle-homebrew-amd64 install_ci garden gz_utils2-install-pkg-focal-amd64 +install_ci garden gz_utils2-install-pkg-jammy-amd64 install_ci garden gz_utils2-install_bottle-homebrew-amd64 install_ci garden sdformat13-install-pkg-focal-amd64 +install_ci garden sdformat13-install-pkg-jammy-amd64 install_ci garden sdformat13-install_bottle-homebrew-amd64 install_ci harmonic gz_cmake3-install-pkg-jammy-amd64 install_ci harmonic gz_cmake3-install_bottle-homebrew-amd64