From cf3b6dedc711e5bcd659e65eab239962b1fc6096 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 17 May 2024 16:14:17 +0200 Subject: [PATCH] Use noble on Ionic and __upcoming__ instead of Jammy for PR and daily (#1138) Replace values in gz-collections.yaml to use right platform --------- Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 58 +++++++++++++++--- jenkins-scripts/dsl/logs/generated_jobs.txt | 68 ++++++++++----------- 2 files changed, 84 insertions(+), 42 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index f91dee7e5..fdf0ba837 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -338,7 +338,7 @@ collections: ci: configs: - jammy - - noble + - noble_no_pr - brew - win packaging: @@ -346,7 +346,7 @@ collections: - jammy linux: ignore_major_version: - - gz-harmonic + - gz-harmonic - name: 'ionic' libs: - name: gz-cmake @@ -415,18 +415,18 @@ collections: current_branch: main ci: configs: - - jammy + - noble - brew - win packaging: configs: - - jammy + - noble linux: ignore_major_version: - gz-ionic nightly: distros: - - jammy + - noble - name: '__upcoming__' libs: - name: gz-tools @@ -435,12 +435,12 @@ collections: current_branch: main ci: configs: - - jammy + - noble - brew - win packaging: configs: - - jammy + - noble ci_configs: - name: focal system: @@ -507,7 +507,37 @@ ci_configs: system: so: linux distribution: ubuntu - version: noble + version: noble + arch: amd64 + requirements: + large_memory: + - gz-physics + nvidia_gpu: + - gz-sim + - gz-gui + - gz-rendering + - gz-sensors + exclude: + all: + - gz-harmonic + - __upcoming__ + abichecker: + - gz-cmake + - gz-tools + pre_setup_script_hook: + gz-physics: + - "export MAKE_JOBS=1" + tests_disabled: + ci_categories_enabled: + - pr + - pr_abichecker + - stable_branches + - stable_branches_asan + - name: noble_no_pr + system: + so: linux + distribution: ubuntu + version: noble arch: amd64 requirements: large_memory: @@ -650,3 +680,15 @@ packaging_configs: - "export MAKE_JOBS=1" exclude: - __upcoming__ + - name: noble + system: + so: linux + distribution: ubuntu + version: jammy + arch: + - amd64 + pre_setup_script_hook: + gz-physics: + - "export MAKE_JOBS=1" + exclude: + - __upcoming__ diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 38eb393fc..bfbf662a7 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,4 +1,4 @@ -asan_ci __upcoming__ gz_tools-ci_asan-main-jammy-amd64 +asan_ci __upcoming__ gz_tools-ci_asan-main-noble-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 +62,24 @@ 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 +asan_ci ionic gz_cmake-ci_asan-main-noble-amd64 +asan_ci ionic gz_common-ci_asan-main-noble-amd64 +asan_ci ionic gz_fuel_tools-ci_asan-main-noble-amd64 +asan_ci ionic gz_gui-ci_asan-main-noble-amd64 +asan_ci ionic gz_launch-ci_asan-main-noble-amd64 +asan_ci ionic gz_math-ci_asan-main-noble-amd64 +asan_ci ionic gz_msgs-ci_asan-main-noble-amd64 +asan_ci ionic gz_physics-ci_asan-main-noble-amd64 +asan_ci ionic gz_plugin-ci_asan-main-noble-amd64 +asan_ci ionic gz_rendering-ci_asan-main-noble-amd64 +asan_ci ionic gz_sensors-ci_asan-main-noble-amd64 +asan_ci ionic gz_sim-ci_asan-main-noble-amd64 +asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64 +asan_ci ionic gz_transport-ci_asan-main-noble-amd64 +asan_ci ionic gz_utils-ci_asan-main-noble-amd64 +asan_ci ionic sdformat-ci_asan-main-noble-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,52 +285,52 @@ 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_bottle-homebrew-amd64