Revert "🏁 Citadel EOL (#1228)"

This reverts commit 0ee823b.

Signed-off-by: Steve Peters <[email protected]>

bloom/ros_gz/README.md

@@ -15,6 +15,7 @@ Each ROS release defines one version of Gazebo supported officially through
 all the ROS packages. The different combinations of ROS <-> Gazebo can be
 found in the [REP-3](http://www.ros.org/reps/rep-2000.html). Some examples:
 
+ * ROS 2 Foxy: Citadel
  * ROS 2 Humble: Fortress
  * ROS 2 Iron: Fortress
 

jenkins-scripts/dsl/gz-collections.yaml

@@ -26,6 +26,84 @@
 
 spec_version: 0
 collections:
+  - name: 'citadel'
+    libs:
+      - name: gz-cmake
+        major_version: 2
+        repo:
+          current_branch: ign-cmake2
+      - name: gz-tools
+        major_version: 1
+        repo:
+          current_branch: ign-tools1
+      - name: gz-math
+        major_version: 6
+        repo:
+          current_branch: ign-math6
+      - name: gz-plugin
+        major_version: 1
+        repo:
+          current_branch: ign-plugin1
+      - name: gz-common
+        major_version: 3
+        repo:
+          current_branch: ign-common3
+      - name: gz-msgs
+        major_version: 5
+        repo:
+          current_branch: ign-msgs5
+      - name: gz-rendering
+        major_version: 3
+        repo:
+          current_branch: ign-rendering3
+      - name: sdformat
+        major_version: 9
+        repo:
+          current_branch: sdf9
+      - name: gz-fuel-tools
+        major_version: 4
+        repo:
+          current_branch: ign-fuel-tools4
+      - name: gz-transport
+        major_version: 8
+        repo:
+          current_branch: ign-transport8
+      - name: gz-gui
+        major_version: 3
+        repo:
+          current_branch: ign-gui3
+      - name: gz-sensors
+        major_version: 3
+        repo:
+          current_branch: ign-sensors3
+      - name: gz-physics
+        major_version: 2
+        repo:
+          current_branch: ign-physics2
+      - name: gz-sim
+        major_version: 3
+        repo:
+          current_branch: ign-gazebo3
+      - name: gz-launch
+        major_version: 2
+        repo:
+          current_branch: ign-launch2
+      - name: gz-citadel
+        major_version: 1
+        repo:
+          current_branch: main
+    ci:
+      configs:
+        - focal
+        - brew
+        - win_citadel
+    packaging:
+      configs:
+        - focal
+        - brew
+      linux:
+          ignore_major_version:
+            - gz-citadel
   - name: 'fortress'
     libs:
       - name: gz-cmake
@@ -453,6 +531,7 @@ ci_configs:
         - gz-sensors
     exclude:
       all:
+        - gz-citadel
         - gz-fortress
       abichecker:
         - gz-cmake
@@ -564,6 +643,7 @@ ci_configs:
     requirements:
     exclude:
       all:
+        - gz-citadel
         - gz-fortress
         - gz-harmonic
         - gz-ionic
@@ -649,6 +729,36 @@ ci_configs:
     ci_categories_enabled:
       - pr
       - stable_branches
+  # No gz-sim and gz-launch on Citadel
+  - name: win_citadel
+    system:
+      so: windows
+      distribution: windows
+      version: "10"
+      arch: amd64
+    requirements:
+    exclude:
+      all:
+        - gz-citadel
+        - gz-sim
+        - gz-launch
+    cmake_warnings_disabled:
+      - gz-cmake
+      - gz-common
+      - gz-fuel-tools
+      - gz-gui
+      - gz-math
+      - gz-msgs
+      - gz-physics
+      - gz-rendering
+      - gz-sensors
+      - gz-tools
+      - gz-transport
+      - gz-utils
+      - sdformat
+    ci_categories_enabled:
+      - pr
+      - stable_branches
 packaging_configs:
   - name: focal
     system:

terminal-dashboard/_dashboard_lib.sh

@@ -6,7 +6,25 @@ get_libraries_by_collection()
 {
     local COLLECTION=${1}
 
-    if [ "$COLLECTION" = "fortress" ]; then
+    if [ "$COLLECTION" = "citadel" ]; then
+      LIBS="
+	ignition-cmake2
+	ignition-math6
+	ignition-tools
+	ignition-common3
+	ignition-msgs5
+	ignition-transport8
+	ignition-fuel-tools4
+	ignition-plugin
+	ignition-rendering3
+	sdformat9
+	ignition-physics2
+	ignition-sensors3
+	ignition-gui3
+	ignition-gazebo3
+	ignition-launch2
+	ignition-citadel"
+    elif [ "$COLLECTION" = "fortress" ]; then
       LIBS="
 	ignition-cmake2
 	ignition-math6

terminal-dashboard/table.bash

@@ -6,7 +6,7 @@ SCRIPT_DIR="${SCRIPT_DIR%/*}"
 
 # Arguments
 #
-# 1. <collection>: Required: A supported collection, i.e. "fortress", "harmonic", etc.
+# 1. <collection>: Required: A supported collection, i.e. "citadel", "fortesss", etc.
 # 2. <package_repo>: Optional: stable / prerelease / nightly (defaults to stable)
 #
 # Usage
@@ -32,7 +32,7 @@ ARCHS=( "amd64")
 DISTROS=( "ubuntu" )
 # No nightlies or pre-releases for arm
 if [[ $PACKAGE_REPO == "stable" ]]; then
-  if [[ $COLLECTION == "fortress" ]]; then
+  if [[ $COLLECTION == "citadel" || $COLLECTION == "fortress" ]]; then
     ARCHS+=( "i386" )
   fi
 
@@ -61,7 +61,9 @@ for LIB in $(get_libraries_by_collection "${COLLECTION}" ); do
   for DISTRO in "${DISTROS[@]}"
   do
     if [[ $DISTRO == "ubuntu" ]]; then
-      if [[ $COLLECTION == "fortress" ]]; then
+      if [[ $COLLECTION == "citadel" ]]; then
+        VERS=( "bionic" "focal" )
+      elif [[ $COLLECTION == "fortress" ]]; then
         VERS=( "bionic" "focal" "jammy" )
       elif [[ $COLLECTION == "harmonic" ]]; then
         VERS=( "jammy" )