Remove all references to Garden: EOL

bloom/ros_gz/Dockerfile

@@ -1,5 +1,5 @@
-ARG ROS_DISTRO=humble
-ARG GAZEBO_DISTRO=garden
+ARG ROS_DISTRO=jazzy
+ARG GAZEBO_DISTRO=harmonic
 ARG URL_OSRF_ROSDEP_REPLACE=
 
 FROM ros:$ROS_DISTRO-ros-base

bloom/ros_gz/README.md

@@ -31,11 +31,16 @@ newer version of Gazebo than the one selected in REP-2000.
 
 | Gazebo Release | ROS / ROS 2 Release | status     | ros_gz branch | -release repository | CI | release cmd |
 | ---------------|---------------------|------------|---------------|---------------------|----|-------------|
-| 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/) | <details>```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```</details> |
-| 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/) | <details>```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```</details> |
 | 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/) | <details>```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```</details> |
 | 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/) | <details>```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```</details> |
 
+### List of EOL releases
+
+| Gazebo Release | ROS / ROS 2 Release | status     | ros_gz branch | -release repository | CI | release cmd |
+| ---------------|---------------------|------------|---------------|---------------------|----|-------------|
+| 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/) | <details>```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```</details> |
+| 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/) | <details>```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```</details> |
+
 ### Upstream versions released using this tutorial
 
 The `gbp -release repository` hosts the latest version released by the
@@ -64,9 +69,9 @@ On the fork, the `rename-ros_gz-pkgs.bash` script will change the bloom template
 
  1. Clone the new repo, go to the directory and run rename-gazebo-ros-pkgs.bash
     - Usage: `$ rename-ros_gz-pkgs.bash <desired_gz_version> <space separted list of rosdistros to release>`
-    - Example: `$ rename-ros_gz-pkgs.bash garden humble`
+    - Example: `$ rename-ros_gz-pkgs.bash harmonic humble`
 
-If several unofficial wrappers using different Gazebo releases are going to exist for the same ROS 2 distribution (i.e: Garden and Harmonic for ROS 2 Iron), the rename script supports to declare a conflict using the `GZ_RELEASE_TO_CONFLICT` variable:
+If several unofficial wrappers using different Gazebo releases are going to exist for the same ROS 2 distribution (i.e: Harmonic for ROS 2 Iron), the rename script supports to declare a conflict using the `GZ_RELEASE_TO_CONFLICT` variable:
 
 ```
 GZ_RELEASE_TO_CONFLICT=garden ./rename-ros_gz-pkgs.bash harmonic humble
@@ -75,7 +80,7 @@ GZ_RELEASE_TO_CONFLICT=garden ./rename-ros_gz-pkgs.bash harmonic humble
 ### 2.2 Create a custom track in tracks.yml
 
 Copy the existing ROS 2 yaml track information and rename it to `${ros2}_gz${version}`.
-For example, the `humble` track to be used as base for Garden would be `humble_gzgarden`.
+For example, the `humble` track to be used as base for Harmonic would be `humble_gzharmonic`.
 
 New versioning requires bumping to large numbers. Set:
 
@@ -108,11 +113,11 @@ that encapsulates the bloom arguments to be passed and the use of this enviromen
 ```
 ./bloom_from_special_env.bash <ROS_DISTRO> <TARGET_NEW_GAZEBO_COLLECTION> <URL_OSRF_ROSDEP>
 
-i.e: release ros_gz on ROS 2 Humble replacing Gazebo Fortress by Gazebo Garden
+i.e: release ros_gz on ROS 2 Humble replacing Gazebo Fortress by Gazebo Harmonic
 ./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
+    harmonic \
+    https://raw.githubusercontent.com/osrf/osrf-rosdep/refs/heads/master/gz/replace_fortress_with_harmonic/00-replace-gz-fortress-with-harmonic.list
 ```
 
 The script will create the docker enviroment with the rosdep modifications needed
@@ -129,8 +134,8 @@ i.e use a https://github.com/gazebo-testing/ros_ign-gzharmonic-release as gbp te
 RELEASE_REPO_URL=https://github.com/gazebo-testing/ros_ign-gzharmonic-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
+    harmonic \
+    https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_harmonic/00-replace-gz-fortress-with-harmonic.list
 ```
 
 ### 3.2 Launching jobs in the osrf buildfarm

bloom/ros_gz/bloom_from_special_env.bash

@@ -3,7 +3,7 @@
 if [[ $# -lt 3 ]]; then
   echo "Usage: $0 <ROS_DISTRO> <TARGET_NEW_GAZEBO_COLLECTION> <URL_OSRF_ROSDEP_REPLACE>"
   echo "Example:"
-  echo "  $0 humble garden https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list"
+  echo "  $0 humble harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_harmonic/00-replace-gz-fortress-with-harmonic.list"
   exit 1
 fi
 

jenkins-scripts/dsl/gz-collections.yaml

@@ -187,89 +187,6 @@ collections:
       linux:
         ignore_major_version:
           - gz-fortress
-  - name: 'garden'
-    libs:
-      - name: gz-cmake
-        major_version: 3
-        repo:
-          current_branch: gz-cmake3
-      - name: gz-tools
-        major_version: 2
-        repo:
-          current_branch: gz-tools2
-      - name: gz-utils
-        major_version: 2
-        repo:
-          current_branch: gz-utils2
-      - name: gz-math
-        major_version: 7
-        repo:
-          current_branch: gz-math7
-      - name: gz-plugin
-        major_version: 2
-        repo:
-          current_branch: gz-plugin2
-      - name: gz-common
-        major_version: 5
-        repo:
-          current_branch: gz-common5
-      - name: gz-msgs
-        major_version: 9
-        repo:
-          current_branch: gz-msgs9
-      - name: gz-rendering
-        major_version: 7
-        repo:
-          current_branch: gz-rendering7
-      - name: sdformat
-        major_version: 13
-        repo:
-          current_branch: sdf13
-      - name: gz-fuel-tools
-        major_version: 8
-        repo:
-          current_branch: gz-fuel-tools8
-      - name: gz-transport
-        major_version: 12
-        repo:
-          current_branch: gz-transport12
-      - name: gz-gui
-        major_version: 7
-        repo:
-          current_branch: gz-gui7
-      - name: gz-sensors
-        major_version: 7
-        repo:
-          current_branch: gz-sensors7
-      - name: gz-physics
-        major_version: 6
-        repo:
-          current_branch: gz-physics6
-      - name: gz-sim
-        major_version: 7
-        repo:
-          current_branch: gz-sim7
-      - name: gz-launch
-        major_version: 6
-        repo:
-          current_branch: gz-launch6
-      - name: gz-garden
-        major_version: 1
-        repo:
-          current_branch: main
-    ci:
-      configs:
-        - focal_exclude_harmonic_abi_dups
-        - brew
-        - win
-    packaging:
-      configs:
-        - focal
-        - jammy
-        - brew
-      linux:
-        ignore_major_version:
-          - gz-garden
   - name: 'harmonic'
     libs:
       - name: gz-cmake
@@ -616,7 +533,6 @@ ci_configs:
       all:
         - gz-citadel
         - gz-fortress
-        - gz-garden
       abichecker:
         - gz-cmake
         - gz-tools
@@ -659,43 +575,6 @@ ci_configs:
       - pr_abichecker
       - stable_branches
       - stable_branches_asan
-  - name: focal_exclude_harmonic_abi_dups
-    system:
-      so: linux
-      distribution: ubuntu
-      version: focal
-      arch: amd64
-    requirements:
-      large_memory:
-        - gz-physics
-      nvidia_gpu:
-        - gz-sim
-        - gz-gui
-        - gz-rendering
-        - gz-sensors
-    exclude:
-      all:
-        - gz-citadel
-        - gz-fortress
-        - gz-garden
-      abichecker:
-        - gz-cmake
-        - gz-tools
-        # Exclude the abichecker that are duplicate with Harmonic
-        # The ones on Harmonic run on jammy
-        - gz-common
-        - gz-math
-        - gz-plugin
-        - gz-utils
-    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
     system:
       so: linux
@@ -766,7 +645,6 @@ ci_configs:
       all:
         - gz-citadel
         - gz-fortress
-        - gz-garden
         - gz-harmonic
         - gz-ionic
         - gz-jetty
@@ -800,7 +678,6 @@ ci_configs:
     exclude:
       all:
         - gz-fortress
-        - gz-garden
         - gz-harmonic
         - gz-ionic
         - gz-jetty

jenkins-scripts/dsl/logs/generated_jobs.txt

@@ -45,22 +45,6 @@ asan_ci fortress gz_tools-ci_asan-ign-tools1-focal-amd64
 asan_ci fortress gz_transport-ci_asan-ign-transport11-focal-amd64
 asan_ci fortress gz_utils-ci_asan-ign-utils1-focal-amd64
 asan_ci fortress sdformat-ci_asan-sdf12-focal-amd64
-asan_ci garden gz_cmake-ci_asan-gz-cmake3-focal-amd64
-asan_ci garden gz_common-ci_asan-gz-common5-focal-amd64
-asan_ci garden gz_fuel_tools-ci_asan-gz-fuel-tools8-focal-amd64
-asan_ci garden gz_gui-ci_asan-gz-gui7-focal-amd64
-asan_ci garden gz_launch-ci_asan-gz-launch6-focal-amd64
-asan_ci garden gz_math-ci_asan-gz-math7-focal-amd64
-asan_ci garden gz_msgs-ci_asan-gz-msgs9-focal-amd64
-asan_ci garden gz_physics-ci_asan-gz-physics6-focal-amd64
-asan_ci garden gz_plugin-ci_asan-gz-plugin2-focal-amd64
-asan_ci garden gz_rendering-ci_asan-gz-rendering7-focal-amd64
-asan_ci garden gz_sensors-ci_asan-gz-sensors7-focal-amd64
-asan_ci garden gz_sim-ci_asan-gz-sim7-focal-amd64
-asan_ci garden gz_tools-ci_asan-gz-tools2-focal-amd64
-asan_ci garden gz_transport-ci_asan-gz-transport12-focal-amd64
-asan_ci garden gz_utils-ci_asan-gz-utils2-focal-amd64
-asan_ci garden sdformat-ci_asan-sdf13-focal-amd64
 asan_ci harmonic gz_cmake-ci_asan-gz-cmake3-jammy-amd64
 asan_ci harmonic gz_common-ci_asan-gz-common5-jammy-amd64
 asan_ci harmonic gz_fuel_tools-ci_asan-gz-fuel-tools9-jammy-amd64
@@ -248,54 +232,6 @@ branch_ci fortress gz_utils-ign-utils1-win
 branch_ci fortress sdformat-ci-sdf12-focal-amd64
 branch_ci fortress sdformat-ci-sdf12-homebrew-amd64
 branch_ci fortress sdformat-sdf12-win
-branch_ci garden gz_cmake-3-win
-branch_ci garden gz_cmake-ci-gz-cmake3-focal-amd64
-branch_ci garden gz_cmake-ci-gz-cmake3-homebrew-amd64
-branch_ci garden gz_common-5-win
-branch_ci garden gz_common-ci-gz-common5-focal-amd64
-branch_ci garden gz_common-ci-gz-common5-homebrew-amd64
-branch_ci garden gz_fuel_tools-8-win
-branch_ci garden gz_fuel_tools-ci-gz-fuel-tools8-focal-amd64
-branch_ci garden gz_fuel_tools-ci-gz-fuel-tools8-homebrew-amd64
-branch_ci garden gz_gui-7-win
-branch_ci garden gz_gui-ci-gz-gui7-focal-amd64
-branch_ci garden gz_gui-ci-gz-gui7-homebrew-amd64
-branch_ci garden gz_launch-6-win
-branch_ci garden gz_launch-ci-gz-launch6-focal-amd64
-branch_ci garden gz_launch-ci-gz-launch6-homebrew-amd64
-branch_ci garden gz_math-7-win
-branch_ci garden gz_math-ci-gz-math7-focal-amd64
-branch_ci garden gz_math-ci-gz-math7-homebrew-amd64
-branch_ci garden gz_msgs-9-win
-branch_ci garden gz_msgs-ci-gz-msgs9-focal-amd64
-branch_ci garden gz_msgs-ci-gz-msgs9-homebrew-amd64
-branch_ci garden gz_physics-6-win
-branch_ci garden gz_physics-ci-gz-physics6-focal-amd64
-branch_ci garden gz_physics-ci-gz-physics6-homebrew-amd64
-branch_ci garden gz_plugin-2-win
-branch_ci garden gz_plugin-ci-gz-plugin2-focal-amd64
-branch_ci garden gz_plugin-ci-gz-plugin2-homebrew-amd64
-branch_ci garden gz_rendering-7-win
-branch_ci garden gz_rendering-ci-gz-rendering7-focal-amd64
-branch_ci garden gz_rendering-ci-gz-rendering7-homebrew-amd64
-branch_ci garden gz_sensors-7-win
-branch_ci garden gz_sensors-ci-gz-sensors7-focal-amd64
-branch_ci garden gz_sensors-ci-gz-sensors7-homebrew-amd64
-branch_ci garden gz_sim-7-win
-branch_ci garden gz_sim-ci-gz-sim7-focal-amd64
-branch_ci garden gz_sim-ci-gz-sim7-homebrew-amd64
-branch_ci garden gz_tools-2-win
-branch_ci garden gz_tools-ci-gz-tools2-focal-amd64
-branch_ci garden gz_tools-ci-gz-tools2-homebrew-amd64
-branch_ci garden gz_transport-12-win
-branch_ci garden gz_transport-ci-gz-transport12-focal-amd64
-branch_ci garden gz_transport-ci-gz-transport12-homebrew-amd64
-branch_ci garden gz_utils-2-win
-branch_ci garden gz_utils-ci-gz-utils2-focal-amd64
-branch_ci garden gz_utils-ci-gz-utils2-homebrew-amd64
-branch_ci garden sdformat-ci-sdf13-focal-amd64
-branch_ci garden sdformat-ci-sdf13-homebrew-amd64
-branch_ci garden sdformat-sdf13-win
 branch_ci harmonic gz_cmake-3-win
 branch_ci harmonic gz_cmake-ci-gz-cmake3-homebrew-amd64
 branch_ci harmonic gz_cmake-ci-gz-cmake3-jammy-amd64
@@ -571,57 +507,6 @@ install_ci fortress gz_utils1-install_bottle-homebrew-amd64
 install_ci fortress sdformat12-install-pkg-focal-amd64
 install_ci fortress sdformat12-install-pkg-jammy-amd64
 install_ci fortress sdformat12-install_bottle-homebrew-amd64
-install_ci garden gz_cmake3-install-pkg-focal-amd64
-install_ci garden gz_cmake3-install-pkg-jammy-amd64
-install_ci garden gz_cmake3-install_bottle-homebrew-amd64
-install_ci garden gz_common5-install-pkg-focal-amd64
-install_ci garden gz_common5-install-pkg-jammy-amd64
-install_ci garden gz_common5-install_bottle-homebrew-amd64
-install_ci garden gz_fuel_tools8-install-pkg-focal-amd64
-install_ci garden gz_fuel_tools8-install-pkg-jammy-amd64
-install_ci garden gz_fuel_tools8-install_bottle-homebrew-amd64
-install_ci garden gz_garden-install-pkg-focal-amd64
-install_ci garden gz_garden-install-pkg-jammy-amd64
-install_ci garden gz_garden-install_bottle-homebrew-amd64
-install_ci garden gz_gui7-install-pkg-focal-amd64
-install_ci garden gz_gui7-install-pkg-jammy-amd64
-install_ci garden gz_gui7-install_bottle-homebrew-amd64
-install_ci garden gz_launch6-install-pkg-focal-amd64
-install_ci garden gz_launch6-install-pkg-jammy-amd64
-install_ci garden gz_launch6-install_bottle-homebrew-amd64
-install_ci garden gz_math7-install-pkg-focal-amd64
-install_ci garden gz_math7-install-pkg-jammy-amd64
-install_ci garden gz_math7-install_bottle-homebrew-amd64
-install_ci garden gz_msgs9-install-pkg-focal-amd64
-install_ci garden gz_msgs9-install-pkg-jammy-amd64
-install_ci garden gz_msgs9-install_bottle-homebrew-amd64
-install_ci garden gz_physics6-install-pkg-focal-amd64
-install_ci garden gz_physics6-install-pkg-jammy-amd64
-install_ci garden gz_physics6-install_bottle-homebrew-amd64
-install_ci garden gz_plugin2-install-pkg-focal-amd64
-install_ci garden gz_plugin2-install-pkg-jammy-amd64
-install_ci garden gz_plugin2-install_bottle-homebrew-amd64
-install_ci garden gz_rendering7-install-pkg-focal-amd64
-install_ci garden gz_rendering7-install-pkg-jammy-amd64
-install_ci garden gz_rendering7-install_bottle-homebrew-amd64
-install_ci garden gz_sensors7-install-pkg-focal-amd64
-install_ci garden gz_sensors7-install-pkg-jammy-amd64
-install_ci garden gz_sensors7-install_bottle-homebrew-amd64
-install_ci garden gz_sim7-install-pkg-focal-amd64
-install_ci garden gz_sim7-install-pkg-jammy-amd64
-install_ci garden gz_sim7-install_bottle-homebrew-amd64
-install_ci garden gz_tools2-install-pkg-focal-amd64
-install_ci garden gz_tools2-install-pkg-jammy-amd64
-install_ci garden gz_tools2-install_bottle-homebrew-amd64
-install_ci garden gz_transport12-install-pkg-focal-amd64
-install_ci garden gz_transport12-install-pkg-jammy-amd64
-install_ci garden gz_transport12-install_bottle-homebrew-amd64
-install_ci garden gz_utils2-install-pkg-focal-amd64
-install_ci garden gz_utils2-install-pkg-jammy-amd64
-install_ci garden gz_utils2-install_bottle-homebrew-amd64
-install_ci garden sdformat13-install-pkg-focal-amd64
-install_ci garden sdformat13-install-pkg-jammy-amd64
-install_ci garden sdformat13-install_bottle-homebrew-amd64
 install_ci harmonic gz_cmake3-install-pkg-jammy-amd64
 install_ci harmonic gz_cmake3-install-pkg-noble-amd64
 install_ci harmonic gz_cmake3-install_bottle-homebrew-amd64
@@ -741,7 +626,5 @@ install_ci jetty gz_utils3-install-pkg-noble-amd64
 install_ci jetty gz_utils3-install_bottle-homebrew-amd64
 install_ci jetty sdformat15-install-pkg-noble-amd64
 install_ci jetty 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

jenkins-scripts/dsl/ros_gz_bridge.dsl

@@ -12,13 +12,7 @@ def bridge_packages = [
   'ros_gz_sim_demos'
 ]
 
-def gzgarden_ros_distros_ci = [
-  'humble',
-  'iron'
-]
-
 def unofficial_combinations = [
-  'garden' : ['humble', 'iron'],
   'harmonic' : ['humble', 'iron']
 ]