Skip to content

Commit

Permalink
Use noble on Ionic and __upcoming__ instead of Jammy for PR and daily (
Browse files Browse the repository at this point in the history
…#1138)

Replace values in gz-collections.yaml to use right platform

---------
Signed-off-by: Jose Luis Rivero <[email protected]>
  • Loading branch information
j-rivero authored May 17, 2024
1 parent c8caafe commit cf3b6de
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 42 deletions.
58 changes: 50 additions & 8 deletions jenkins-scripts/dsl/gz-collections.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -338,15 +338,15 @@ collections:
ci:
configs:
- jammy
- noble
- noble_no_pr
- brew
- win
packaging:
configs:
- jammy
linux:
ignore_major_version:
- gz-harmonic
- gz-harmonic
- name: 'ionic'
libs:
- name: gz-cmake
Expand Down Expand Up @@ -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
Expand All @@ -435,12 +435,12 @@ collections:
current_branch: main
ci:
configs:
- jammy
- noble
- brew
- win
packaging:
configs:
- jammy
- noble
ci_configs:
- name: focal
system:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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__
68 changes: 34 additions & 34 deletions jenkins-scripts/dsl/logs/generated_jobs.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cf3b6de

Please sign in to comment.