From 42a35404dbe5c48e48e95f6e69c12c78835800c2 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 19 Dec 2023 20:33:08 +0100 Subject: [PATCH 1/4] Add Humble/Harmonic bloom instructions Signed-off-by: Jose Luis Rivero --- bloom/ros_gz/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bloom/ros_gz/README.md b/bloom/ros_gz/README.md index 09fdd9a08..fe66052fd 100644 --- a/bloom/ros_gz/README.md +++ b/bloom/ros_gz/README.md @@ -33,7 +33,8 @@ newer version of Gazebo than the one selected in REP-2000. | ---------------|---------------------|------------|---------------|---------------------|----|-------------| | Garden | Humble | stable | humble | https://github.com/gazebo-release/ros_ign-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_ign-release ./bloom_from_special_env.bash humble garden https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list```
| | Garden | Iron | stable | iron | https://github.com/gazebo-release/ros_ign-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_ign-release ./bloom_from_special_env.bash iron garden https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list```
| -| Harmonic | Iron | stable | ros2 | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash iron harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep```
| +| Harmonic | Humble | stable | humble | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash hubmle harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_harmonic/00-replace-gz-fortress-with-harmonic.list```
| +| Harmonic | Iron | stable | ros2 | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash iron harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep```
| ### Upstream versions released using this tutorial From 736d76d9d69d291887ecd01929bbf355172d8e38 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 19 Dec 2023 20:34:11 +0100 Subject: [PATCH 2/4] Add DSL code for the humble/iron option Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/ros_gz_bridge.dsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/ros_gz_bridge.dsl b/jenkins-scripts/dsl/ros_gz_bridge.dsl index 09a3cb860..45150a840 100644 --- a/jenkins-scripts/dsl/ros_gz_bridge.dsl +++ b/jenkins-scripts/dsl/ros_gz_bridge.dsl @@ -19,7 +19,7 @@ def gzgarden_ros_distros_ci = [ def unofficial_combinations = [ 'garden' : ['humble', 'iron'], - 'harmonic' : ['iron'] + 'harmonic' : ['humble', 'iron'] ] logging_list = [:] From b849bd674db76a85ecdad8f641fa477ad4bab795 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 21 Dec 2023 17:10:49 +0100 Subject: [PATCH 3/4] Fix humble references Signed-off-by: Jose Luis Rivero --- bloom/ros_gz/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bloom/ros_gz/README.md b/bloom/ros_gz/README.md index fe66052fd..ed2bd43e5 100644 --- a/bloom/ros_gz/README.md +++ b/bloom/ros_gz/README.md @@ -33,7 +33,7 @@ newer version of Gazebo than the one selected in REP-2000. | ---------------|---------------------|------------|---------------|---------------------|----|-------------| | Garden | Humble | stable | humble | https://github.com/gazebo-release/ros_ign-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_ign-release ./bloom_from_special_env.bash humble garden https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list```
| | Garden | Iron | stable | iron | https://github.com/gazebo-release/ros_ign-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_ign-release ./bloom_from_special_env.bash iron garden https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list```
| -| Harmonic | Humble | stable | humble | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash hubmle harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_harmonic/00-replace-gz-fortress-with-harmonic.list```
| +| Harmonic | Humble | stable | humble | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash hubmle harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_harmonic/00-replace-gz-fortress-with-harmonic.list```
| | Harmonic | Iron | stable | ros2 | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64/) |
```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash iron harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep```
| ### Upstream versions released using this tutorial From 8c404f13350c0b47c1d80fe5da46f72b5589eff9 Mon Sep 17 00:00:00 2001 From: j-rivero Date: Fri, 22 Dec 2023 14:28:56 +0000 Subject: [PATCH 4/4] Automated change: update logs [skip ci] --- jenkins-scripts/dsl/logs/generated_jobs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt index 7d079d0aa..94825d5c3 100644 --- a/jenkins-scripts/dsl/logs/generated_jobs.txt +++ b/jenkins-scripts/dsl/logs/generated_jobs.txt @@ -486,4 +486,5 @@ install_ci ionic sdformat15-install-pkg-jammy-amd64 install_ci ionic sdformat15-install_bottle-homebrew-amd64 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64 +unofficial_wrappers_install_pkg_ci harmonic ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64 unofficial_wrappers_install_pkg_ci harmonic ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64