From 511548388b7f297f3593546305b06bff4a13f849 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 6 May 2024 19:17:13 +0200 Subject: [PATCH 1/3] Use noble on Ionic CI Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index f91dee7e5..61f4bf8fa 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -346,7 +346,7 @@ collections: - jammy linux: ignore_major_version: - - gz-harmonic + - gz-harmonic - name: 'ionic' libs: - name: gz-cmake @@ -415,12 +415,12 @@ collections: current_branch: main ci: configs: - - jammy + - noble - brew - win packaging: configs: - - jammy + - noble linux: ignore_major_version: - gz-ionic @@ -507,7 +507,7 @@ ci_configs: system: so: linux distribution: ubuntu - version: noble + version: noble arch: amd64 requirements: large_memory: From cb21d2b2f76ae9f1651c94bf768e65fba0122330 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 6 May 2024 19:28:43 +0200 Subject: [PATCH 2/3] Move __upcoming__ and add a noble packaging option Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 61f4bf8fa..799418713 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -435,12 +435,12 @@ collections: current_branch: main ci: configs: - - jammy + - noble - brew - win packaging: configs: - - jammy + - noble ci_configs: - name: focal system: @@ -520,6 +520,7 @@ ci_configs: exclude: all: - gz-harmonic + - gz-ionic - __upcoming__ abichecker: - gz-cmake @@ -648,5 +649,15 @@ packaging_configs: pre_setup_script_hook: gz-physics: - "export MAKE_JOBS=1" + - name: noble + system: + so: linux + distribution: ubuntu + version: noble + arch: + - amd64 + pre_setup_script_hook: + gz-physics: + - "export MAKE_JOBS=1" exclude: - __upcoming__ From ba2493f8f61ca230acf02bf311ec2e642580f986 Mon Sep 17 00:00:00 2001 From: j-rivero Date: Mon, 6 May 2024 17:30:28 +0000 Subject: [PATCH 3/3] Automated change: update logs [skip ci] --- jenkins-scripts/dsl/logs/generated_jobs.txt | 85 +++++++++------------ 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 38eb393fc..bfb0bc95e 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,4 +1,3 @@ -asan_ci __upcoming__ gz_tools-ci_asan-main-jammy-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 asan_ci citadel gz_common-ci_asan-ign-common3-focal-amd64 asan_ci citadel gz_fuel_tools-ci_asan-ign-fuel-tools4-focal-amd64 @@ -62,24 +61,8 @@ asan_ci harmonic gz_tools-ci_asan-gz-tools2-jammy-amd64 asan_ci harmonic gz_transport-ci_asan-gz-transport13-jammy-amd64 asan_ci harmonic gz_utils-ci_asan-gz-utils2-jammy-amd64 asan_ci harmonic sdformat-ci_asan-sdf14-jammy-amd64 -asan_ci ionic gz_cmake-ci_asan-main-jammy-amd64 -asan_ci ionic gz_common-ci_asan-main-jammy-amd64 -asan_ci ionic gz_fuel_tools-ci_asan-main-jammy-amd64 -asan_ci ionic gz_gui-ci_asan-main-jammy-amd64 -asan_ci ionic gz_launch-ci_asan-main-jammy-amd64 -asan_ci ionic gz_math-ci_asan-main-jammy-amd64 -asan_ci ionic gz_msgs-ci_asan-main-jammy-amd64 -asan_ci ionic gz_physics-ci_asan-main-jammy-amd64 -asan_ci ionic gz_plugin-ci_asan-main-jammy-amd64 -asan_ci ionic gz_rendering-ci_asan-main-jammy-amd64 -asan_ci ionic gz_sensors-ci_asan-main-jammy-amd64 -asan_ci ionic gz_sim-ci_asan-main-jammy-amd64 -asan_ci ionic gz_tools-ci_asan-gz-tools2-jammy-amd64 -asan_ci ionic gz_transport-ci_asan-main-jammy-amd64 -asan_ci ionic gz_utils-ci_asan-main-jammy-amd64 -asan_ci ionic sdformat-ci_asan-main-jammy-amd64 branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 -branch_ci __upcoming__ gz_tools-ci-main-jammy-amd64 +branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win branch_ci citadel gz_cmake-ci-ign-cmake2-focal-amd64 branch_ci citadel gz_cmake-ci-ign-cmake2-homebrew-amd64 @@ -285,54 +268,54 @@ branch_ci harmonic sdformat-ci-sdf14-jammy-amd64 branch_ci harmonic sdformat-ci-sdf14-noble-amd64 branch_ci harmonic sdformat-sdf14-win branch_ci ionic gz_cmake-ci-main-homebrew-amd64 -branch_ci ionic gz_cmake-ci-main-jammy-amd64 +branch_ci ionic gz_cmake-ci-main-noble-amd64 branch_ci ionic gz_cmake-main-win branch_ci ionic gz_common-ci-main-homebrew-amd64 -branch_ci ionic gz_common-ci-main-jammy-amd64 +branch_ci ionic gz_common-ci-main-noble-amd64 branch_ci ionic gz_common-main-win branch_ci ionic gz_fuel_tools-ci-main-homebrew-amd64 -branch_ci ionic gz_fuel_tools-ci-main-jammy-amd64 +branch_ci ionic gz_fuel_tools-ci-main-noble-amd64 branch_ci ionic gz_fuel_tools-main-win branch_ci ionic gz_gui-ci-main-homebrew-amd64 -branch_ci ionic gz_gui-ci-main-jammy-amd64 +branch_ci ionic gz_gui-ci-main-noble-amd64 branch_ci ionic gz_gui-main-win branch_ci ionic gz_launch-ci-main-homebrew-amd64 -branch_ci ionic gz_launch-ci-main-jammy-amd64 +branch_ci ionic gz_launch-ci-main-noble-amd64 branch_ci ionic gz_launch-main-win branch_ci ionic gz_math-ci-main-homebrew-amd64 -branch_ci ionic gz_math-ci-main-jammy-amd64 +branch_ci ionic gz_math-ci-main-noble-amd64 branch_ci ionic gz_math-main-win branch_ci ionic gz_msgs-ci-main-homebrew-amd64 -branch_ci ionic gz_msgs-ci-main-jammy-amd64 +branch_ci ionic gz_msgs-ci-main-noble-amd64 branch_ci ionic gz_msgs-main-win branch_ci ionic gz_physics-ci-main-homebrew-amd64 -branch_ci ionic gz_physics-ci-main-jammy-amd64 +branch_ci ionic gz_physics-ci-main-noble-amd64 branch_ci ionic gz_physics-main-win branch_ci ionic gz_plugin-ci-main-homebrew-amd64 -branch_ci ionic gz_plugin-ci-main-jammy-amd64 +branch_ci ionic gz_plugin-ci-main-noble-amd64 branch_ci ionic gz_plugin-main-win branch_ci ionic gz_rendering-ci-main-homebrew-amd64 -branch_ci ionic gz_rendering-ci-main-jammy-amd64 +branch_ci ionic gz_rendering-ci-main-noble-amd64 branch_ci ionic gz_rendering-main-win branch_ci ionic gz_sensors-ci-main-homebrew-amd64 -branch_ci ionic gz_sensors-ci-main-jammy-amd64 +branch_ci ionic gz_sensors-ci-main-noble-amd64 branch_ci ionic gz_sensors-main-win branch_ci ionic gz_sim-ci-main-homebrew-amd64 -branch_ci ionic gz_sim-ci-main-jammy-amd64 +branch_ci ionic gz_sim-ci-main-noble-amd64 branch_ci ionic gz_sim-main-win branch_ci ionic gz_tools-2-win branch_ci ionic gz_tools-ci-gz-tools2-homebrew-amd64 -branch_ci ionic gz_tools-ci-gz-tools2-jammy-amd64 +branch_ci ionic gz_tools-ci-gz-tools2-noble-amd64 branch_ci ionic gz_transport-ci-main-homebrew-amd64 -branch_ci ionic gz_transport-ci-main-jammy-amd64 +branch_ci ionic gz_transport-ci-main-noble-amd64 branch_ci ionic gz_transport-main-win branch_ci ionic gz_utils-ci-main-homebrew-amd64 -branch_ci ionic gz_utils-ci-main-jammy-amd64 +branch_ci ionic gz_utils-ci-main-noble-amd64 branch_ci ionic gz_utils-main-win branch_ci ionic sdformat-ci-main-homebrew-amd64 -branch_ci ionic sdformat-ci-main-jammy-amd64 +branch_ci ionic sdformat-ci-main-noble-amd64 branch_ci ionic sdformat-main-win -install_ci __upcoming__ gz_tools3-install-pkg-jammy-amd64 +install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 install_ci citadel gz_citadel-install_bottle-homebrew-amd64 @@ -468,37 +451,37 @@ install_ci harmonic gz_utils2-install-pkg-jammy-amd64 install_ci harmonic gz_utils2-install_bottle-homebrew-amd64 install_ci harmonic sdformat14-install-pkg-jammy-amd64 install_ci harmonic sdformat14-install_bottle-homebrew-amd64 -install_ci ionic gz_cmake4-install-pkg-jammy-amd64 +install_ci ionic gz_cmake4-install-pkg-noble-amd64 install_ci ionic gz_cmake4-install_bottle-homebrew-amd64 -install_ci ionic gz_common6-install-pkg-jammy-amd64 +install_ci ionic gz_common6-install-pkg-noble-amd64 install_ci ionic gz_common6-install_bottle-homebrew-amd64 -install_ci ionic gz_fuel_tools10-install-pkg-jammy-amd64 +install_ci ionic gz_fuel_tools10-install-pkg-noble-amd64 install_ci ionic gz_fuel_tools10-install_bottle-homebrew-amd64 -install_ci ionic gz_gui9-install-pkg-jammy-amd64 +install_ci ionic gz_gui9-install-pkg-noble-amd64 install_ci ionic gz_gui9-install_bottle-homebrew-amd64 -install_ci ionic gz_launch8-install-pkg-jammy-amd64 +install_ci ionic gz_launch8-install-pkg-noble-amd64 install_ci ionic gz_launch8-install_bottle-homebrew-amd64 -install_ci ionic gz_math8-install-pkg-jammy-amd64 +install_ci ionic gz_math8-install-pkg-noble-amd64 install_ci ionic gz_math8-install_bottle-homebrew-amd64 -install_ci ionic gz_msgs11-install-pkg-jammy-amd64 +install_ci ionic gz_msgs11-install-pkg-noble-amd64 install_ci ionic gz_msgs11-install_bottle-homebrew-amd64 -install_ci ionic gz_physics8-install-pkg-jammy-amd64 +install_ci ionic gz_physics8-install-pkg-noble-amd64 install_ci ionic gz_physics8-install_bottle-homebrew-amd64 -install_ci ionic gz_plugin3-install-pkg-jammy-amd64 +install_ci ionic gz_plugin3-install-pkg-noble-amd64 install_ci ionic gz_plugin3-install_bottle-homebrew-amd64 -install_ci ionic gz_rendering9-install-pkg-jammy-amd64 +install_ci ionic gz_rendering9-install-pkg-noble-amd64 install_ci ionic gz_rendering9-install_bottle-homebrew-amd64 -install_ci ionic gz_sensors9-install-pkg-jammy-amd64 +install_ci ionic gz_sensors9-install-pkg-noble-amd64 install_ci ionic gz_sensors9-install_bottle-homebrew-amd64 -install_ci ionic gz_sim9-install-pkg-jammy-amd64 +install_ci ionic gz_sim9-install-pkg-noble-amd64 install_ci ionic gz_sim9-install_bottle-homebrew-amd64 -install_ci ionic gz_tools2-install-pkg-jammy-amd64 +install_ci ionic gz_tools2-install-pkg-noble-amd64 install_ci ionic gz_tools2-install_bottle-homebrew-amd64 -install_ci ionic gz_transport14-install-pkg-jammy-amd64 +install_ci ionic gz_transport14-install-pkg-noble-amd64 install_ci ionic gz_transport14-install_bottle-homebrew-amd64 -install_ci ionic gz_utils3-install-pkg-jammy-amd64 +install_ci ionic gz_utils3-install-pkg-noble-amd64 install_ci ionic gz_utils3-install_bottle-homebrew-amd64 -install_ci ionic sdformat15-install-pkg-jammy-amd64 +install_ci ionic sdformat15-install-pkg-noble-amd64 install_ci ionic sdformat15-install_bottle-homebrew-amd64 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64