From f1c5eee2e789888ec47d8ea6db276caafcb5ad0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Mon, 26 Aug 2024 22:36:26 +0200 Subject: [PATCH 1/4] Use stable branch gz-transport14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- 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 ef838faee..38912a9b7 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -399,7 +399,7 @@ collections: - name: gz-transport major_version: 14 repo: - current_branch: main + current_branch: gz-transport14 - name: gz-gui major_version: 9 repo: @@ -469,6 +469,10 @@ collections: major_version: 9 repo: current_branch: main + - name: gz-transport + major_version: 14 + repo: + current_branch: gz-transport14 - name: gz-utils major_version: 3 repo: diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 1a68d6bfe..61cace442 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_msgs-ci_asan-main-noble-amd64 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_transport-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 @@ -83,7 +84,7 @@ asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64 asan_ci ionic gz_sensors-ci_asan-gz-sensors9-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_transport-ci_asan-gz-transport14-noble-amd64 asan_ci ionic gz_utils-ci_asan-gz-utils3-noble-amd64 asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64 branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64 @@ -107,6 +108,9 @@ branch_ci __upcoming__ gz_sensors-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_transport-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_transport-ci-main-noble-amd64 +branch_ci __upcoming__ gz_transport-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 @@ -355,9 +359,9 @@ 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-noble-amd64 -branch_ci ionic gz_transport-ci-main-homebrew-amd64 -branch_ci ionic gz_transport-ci-main-noble-amd64 -branch_ci ionic gz_transport-main-win +branch_ci ionic gz_transport-ci-gz-transport14-homebrew-amd64 +branch_ci ionic gz_transport-ci-gz-transport14-noble-amd64 +branch_ci ionic gz_transport-14-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 @@ -378,6 +382,8 @@ install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64 install_ci __upcoming__ gz_sensors9-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_transport14-install-pkg-noble-amd64 +install_ci __upcoming__ gz_transport14-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 From 274cd43d506a7caa1878cbf0663627e03334930e Mon Sep 17 00:00:00 2001 From: caguero Date: Mon, 26 Aug 2024 20:39:03 +0000 Subject: [PATCH 2/4] Automated change: update logs [skip ci] --- jenkins-scripts/dsl/logs/generated_jobs.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 61cace442..2dda42a6a 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -5,7 +5,7 @@ asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 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_transport-ci_asan-main-noble-amd64 +asan_ci __upcoming__ gz_transport-ci_asan-gz-transport14-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 @@ -108,9 +108,9 @@ branch_ci __upcoming__ gz_sensors-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_transport-ci-main-homebrew-amd64 -branch_ci __upcoming__ gz_transport-ci-main-noble-amd64 -branch_ci __upcoming__ gz_transport-main-win +branch_ci __upcoming__ gz_transport-14-win +branch_ci __upcoming__ gz_transport-ci-gz-transport14-homebrew-amd64 +branch_ci __upcoming__ gz_transport-ci-gz-transport14-noble-amd64 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 @@ -359,9 +359,9 @@ 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-noble-amd64 +branch_ci ionic gz_transport-14-win branch_ci ionic gz_transport-ci-gz-transport14-homebrew-amd64 branch_ci ionic gz_transport-ci-gz-transport14-noble-amd64 -branch_ci ionic gz_transport-14-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 From 0a3999d40f889b7d038db56bb51648ae37addd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Mon, 26 Aug 2024 22:50:37 +0200 Subject: [PATCH 3/4] Update jenkins-scripts/dsl/gz-collections.yaml Co-authored-by: Ian Chen --- jenkins-scripts/dsl/gz-collections.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 38912a9b7..046bd7d06 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -472,7 +472,7 @@ collections: - name: gz-transport major_version: 14 repo: - current_branch: gz-transport14 + current_branch: main - name: gz-utils major_version: 3 repo: From 6fb80ea87ac7ded929003b8d352a07ac660d6dcd Mon Sep 17 00:00:00 2001 From: caguero Date: Mon, 26 Aug 2024 20:52:19 +0000 Subject: [PATCH 4/4] Automated change: update logs [skip ci] --- jenkins-scripts/dsl/logs/generated_jobs.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 2dda42a6a..24aca0a8c 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -5,7 +5,7 @@ asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64 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_transport-ci_asan-gz-transport14-noble-amd64 +asan_ci __upcoming__ gz_transport-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 @@ -108,9 +108,9 @@ branch_ci __upcoming__ gz_sensors-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_transport-14-win -branch_ci __upcoming__ gz_transport-ci-gz-transport14-homebrew-amd64 -branch_ci __upcoming__ gz_transport-ci-gz-transport14-noble-amd64 +branch_ci __upcoming__ gz_transport-ci-main-homebrew-amd64 +branch_ci __upcoming__ gz_transport-ci-main-noble-amd64 +branch_ci __upcoming__ gz_transport-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