From 2c87532b182ece3903436798328f37a89313771c Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 24 Aug 2024 17:39:11 -0700 Subject: [PATCH 1/2] Ionic CI: use stable branch for sdformat15 Signed-off-by: Steve Peters --- jenkins-scripts/dsl/gz-collections.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index ad4d7302c..5193bc602 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -391,7 +391,7 @@ collections: - name: sdformat major_version: 15 repo: - current_branch: main + current_branch: sdf15 - name: gz-fuel-tools major_version: 10 repo: @@ -469,6 +469,10 @@ collections: major_version: 3 repo: current_branch: main + - name: sdformat + major_version: 15 + repo: + current_branch: main ci: configs: - noble From 16f1d70ed09e4ae04fac8b6f0a94fa9980c9cb42 Mon Sep 17 00:00:00 2001 From: scpeters Date: Sun, 25 Aug 2024 00:49:34 +0000 Subject: [PATCH 2/2] Automated change: update logs [skip ci] --- jenkins-scripts/dsl/logs/generated_jobs.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 5d819b2c2..1e4d0ce36 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -5,6 +5,7 @@ asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64 asan_ci __upcoming__ gz_sensors-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 __upcoming__ sdformat-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 @@ -83,7 +84,7 @@ 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-gz-utils3-noble-amd64 -asan_ci ionic sdformat-ci_asan-main-noble-amd64 +asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64 branch_ci __upcoming__ gz_cmake-main-win @@ -105,6 +106,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__ sdformat-ci-main-homebrew-amd64 +branch_ci __upcoming__ sdformat-ci-main-noble-amd64 +branch_ci __upcoming__ sdformat-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 @@ -353,9 +357,9 @@ branch_ci ionic gz_transport-main-win branch_ci ionic gz_utils-3-win branch_ci ionic gz_utils-ci-gz-utils3-homebrew-amd64 branch_ci ionic gz_utils-ci-gz-utils3-noble-amd64 -branch_ci ionic sdformat-ci-main-homebrew-amd64 -branch_ci ionic sdformat-ci-main-noble-amd64 -branch_ci ionic sdformat-main-win +branch_ci ionic sdformat-ci-sdf15-homebrew-amd64 +branch_ci ionic sdformat-ci-sdf15-noble-amd64 +branch_ci ionic sdformat-sdf15-win install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64 install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64 install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64 @@ -370,6 +374,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__ sdformat15-install-pkg-noble-amd64 +install_ci __upcoming__ sdformat15-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