From b36dbbec0a701f15f10f2b9ee01cb5dab529e942 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Fri, 23 Aug 2024 17:53:14 +0000 Subject: [PATCH 1/2] use stable branch fro gz-rendering9 Signed-off-by: Ian Chen --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 48ff9d92d..de347b122 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -387,7 +387,7 @@ collections: - name: gz-rendering major_version: 9 repo: - current_branch: main + current_branch: gz-rendering9 - name: sdformat major_version: 15 repo: @@ -453,6 +453,10 @@ collections: major_version: 3 repo: current_branch: main + - name: gz-rendering + major_version: 9 + repo: + current_branch: main ci: configs: - noble diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 609eaf255..2bc694a3f 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -1,4 +1,5 @@ asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64 asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64 @@ -73,7 +74,7 @@ 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_rendering-ci_asan-gz-rendering9-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 @@ -89,6 +90,9 @@ branch_ci __upcoming__ gz_tools-main-win branch_ci __upcoming__ gz_utils-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_utils-ci-main-noble-amd64 branch_ci __upcoming__ gz_utils-main-win +branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64 +branch_ci __upcoming__ gz_rendering-main-win branch_ci citadel gz_cmake-ci-ign-cmake2-focal-amd64 branch_ci citadel gz_cmake-ci-ign-cmake2-homebrew-amd64 branch_ci citadel gz_cmake-ign-cmake2-win @@ -319,9 +323,9 @@ branch_ci ionic gz_physics-main-win branch_ci ionic gz_plugin-ci-main-homebrew-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-noble-amd64 -branch_ci ionic gz_rendering-main-win +branch_ci ionic gz_rendering-ci-gz-rendering9-homebrew-amd64 +branch_ci ionic gz_rendering-ci-gz-rendering9-noble-amd64 +branch_ci ionic gz_rendering-9-win branch_ci ionic gz_sensors-ci-main-homebrew-amd64 branch_ci ionic gz_sensors-ci-main-noble-amd64 branch_ci ionic gz_sensors-main-win @@ -346,6 +350,8 @@ install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 install_ci __upcoming__ gz_utils3-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 install_ci citadel gz_citadel-install_bottle-homebrew-amd64 install_ci citadel gz_cmake2-install-pkg-focal-amd64 From 62f32869e751939f5468aab1cea791231dbe074b Mon Sep 17 00:00:00 2001 From: iche033 Date: Fri, 23 Aug 2024 17:58:48 +0000 Subject: [PATCH 2/2] Automated change: update logs [skip ci] --- jenkins-scripts/dsl/logs/generated_jobs.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 4dc9f2367..4dbaf055a 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -88,15 +88,15 @@ branch_ci __upcoming__ gz_cmake-main-win branch_ci __upcoming__ gz_math-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_math-ci-main-noble-amd64 branch_ci __upcoming__ gz_math-main-win +branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64 +branch_ci __upcoming__ gz_rendering-main-win branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_tools-ci-main-noble-amd64 branch_ci __upcoming__ gz_tools-main-win branch_ci __upcoming__ gz_utils-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_utils-ci-main-noble-amd64 branch_ci __upcoming__ gz_utils-main-win -branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64 -branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64 -branch_ci __upcoming__ gz_rendering-main-win branch_ci citadel gz_cmake-ci-ign-cmake2-focal-amd64 branch_ci citadel gz_cmake-ci-ign-cmake2-homebrew-amd64 branch_ci citadel gz_cmake-ign-cmake2-win @@ -327,9 +327,9 @@ branch_ci ionic gz_physics-main-win branch_ci ionic gz_plugin-ci-main-homebrew-amd64 branch_ci ionic gz_plugin-ci-main-noble-amd64 branch_ci ionic gz_plugin-main-win +branch_ci ionic gz_rendering-9-win branch_ci ionic gz_rendering-ci-gz-rendering9-homebrew-amd64 branch_ci ionic gz_rendering-ci-gz-rendering9-noble-amd64 -branch_ci ionic gz_rendering-9-win branch_ci ionic gz_sensors-ci-main-homebrew-amd64 branch_ci ionic gz_sensors-ci-main-noble-amd64 branch_ci ionic gz_sensors-main-win @@ -352,12 +352,12 @@ install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_math8-install-pkg-noble-amd64 install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64 +install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 +install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64 install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64 install_ci __upcoming__ gz_utils3-install_bottle-homebrew-amd64 -install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64 -install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64 install_ci citadel gz_citadel-install-pkg-focal-amd64 install_ci citadel gz_citadel-install_bottle-homebrew-amd64 install_ci citadel gz_cmake2-install-pkg-focal-amd64