Revert "temp disable base and desktop for final tests"

This reverts commit f7f5b36.
ika-rwth-aachen · Aug 28, 2024 · e3ed42b · e3ed42b
1 parent 187d5c2
commit e3ed42b
Showing 1 changed file with 105 additions and 105 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,27 +25,27 @@ ros-noetic-ros-core:
     include: .gitlab-ci/ros-noetic/ros-noetic-ros-core.yml
     strategy: depend
 
-# ros-noetic-ros-base:
-#   stage: ROS 1 Noetic
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*noetic.*/
-#   needs:
-#     - job: ros-noetic-ros-core
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros-noetic/ros-noetic-ros-base.yml
-#     strategy: depend
-
-# ros-noetic-desktop-full:
-#   stage: ROS 1 Noetic
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*noetic.*/
-#   needs:
-#     - job: ros-noetic-ros-base
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros-noetic/ros-noetic-desktop-full.yml
-#     strategy: depend
+ros-noetic-ros-base:
+  stage: ROS 1 Noetic
+  rules:
+    - if: $ROS_DISTROS =~ /.*noetic.*/
+  needs:
+    - job: ros-noetic-ros-core
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros-noetic/ros-noetic-ros-base.yml
+    strategy: depend
+
+ros-noetic-desktop-full:
+  stage: ROS 1 Noetic
+  rules:
+    - if: $ROS_DISTROS =~ /.*noetic.*/
+  needs:
+    - job: ros-noetic-ros-base
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros-noetic/ros-noetic-desktop-full.yml
+    strategy: depend
 
 
 ros2-humble-ros-core:
@@ -57,27 +57,27 @@ ros2-humble-ros-core:
     include: .gitlab-ci/ros2-humble/ros2-humble-ros-core.yml
     strategy: depend
 
-# ros2-humble-ros-base:
-#   stage: ROS 2 Humble
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*humble.*/
-#   needs:
-#     - job: ros2-humble-ros-core
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-humble/ros2-humble-ros-base.yml
-#     strategy: depend
-
-# ros2-humble-desktop-full:
-#   stage: ROS 2 Humble
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*humble.*/
-#   needs:
-#     - job: ros2-humble-ros-base
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-humble/ros2-humble-desktop-full.yml
-#     strategy: depend
+ros2-humble-ros-base:
+  stage: ROS 2 Humble
+  rules:
+    - if: $ROS_DISTROS =~ /.*humble.*/
+  needs:
+    - job: ros2-humble-ros-core
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-humble/ros2-humble-ros-base.yml
+    strategy: depend
+
+ros2-humble-desktop-full:
+  stage: ROS 2 Humble
+  rules:
+    - if: $ROS_DISTROS =~ /.*humble.*/
+  needs:
+    - job: ros2-humble-ros-base
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-humble/ros2-humble-desktop-full.yml
+    strategy: depend
 
 
 ros2-iron-ros-core:
@@ -89,27 +89,27 @@ ros2-iron-ros-core:
     include: .gitlab-ci/ros2-iron/ros2-iron-ros-core.yml
     strategy: depend
 
-# ros2-iron-ros-base:
-#   stage: ROS 2 Iron
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*iron.*/
-#   needs:
-#     - job: ros2-iron-ros-core
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-iron/ros2-iron-ros-base.yml
-#     strategy: depend
-
-# ros2-iron-desktop-full:
-#   stage: ROS 2 Iron
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*iron.*/
-#   needs:
-#     - job: ros2-iron-ros-base
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-iron/ros2-iron-desktop-full.yml
-#     strategy: depend
+ros2-iron-ros-base:
+  stage: ROS 2 Iron
+  rules:
+    - if: $ROS_DISTROS =~ /.*iron.*/
+  needs:
+    - job: ros2-iron-ros-core
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-iron/ros2-iron-ros-base.yml
+    strategy: depend
+
+ros2-iron-desktop-full:
+  stage: ROS 2 Iron
+  rules:
+    - if: $ROS_DISTROS =~ /.*iron.*/
+  needs:
+    - job: ros2-iron-ros-base
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-iron/ros2-iron-desktop-full.yml
+    strategy: depend
 
 
 ros2-jazzy-ros-core:
@@ -121,27 +121,27 @@ ros2-jazzy-ros-core:
     include: .gitlab-ci/ros2-jazzy/ros2-jazzy-ros-core.yml
     strategy: depend
 
-# ros2-jazzy-ros-base:
-#   stage: ROS 2 Jazzy
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*jazzy.*/
-#   needs:
-#     - job: ros2-jazzy-ros-core
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-jazzy/ros2-jazzy-ros-base.yml
-#     strategy: depend
-
-# ros2-jazzy-desktop-full:
-#   stage: ROS 2 Jazzy
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*jazzy.*/
-#   needs:
-#     - job: ros2-jazzy-ros-base
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-jazzy/ros2-jazzy-desktop-full.yml
-#     strategy: depend
+ros2-jazzy-ros-base:
+  stage: ROS 2 Jazzy
+  rules:
+    - if: $ROS_DISTROS =~ /.*jazzy.*/
+  needs:
+    - job: ros2-jazzy-ros-core
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-jazzy/ros2-jazzy-ros-base.yml
+    strategy: depend
+
+ros2-jazzy-desktop-full:
+  stage: ROS 2 Jazzy
+  rules:
+    - if: $ROS_DISTROS =~ /.*jazzy.*/
+  needs:
+    - job: ros2-jazzy-ros-base
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-jazzy/ros2-jazzy-desktop-full.yml
+    strategy: depend
 
 
 ros2-rolling-ros-core:
@@ -153,24 +153,24 @@ ros2-rolling-ros-core:
     include: .gitlab-ci/ros2-rolling/ros2-rolling-ros-core.yml
     strategy: depend
 
-# ros2-rolling-ros-base:
-#   stage: ROS 2 Rolling
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*rolling.*/
-#   needs:
-#     - job: ros2-rolling-ros-core
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-rolling/ros2-rolling-ros-base.yml
-#     strategy: depend
-
-# ros2-rolling-desktop-full:
-#   stage: ROS 2 Rolling
-#   rules:
-#     - if: $ROS_DISTROS =~ /.*rolling.*/
-#   needs:
-#     - job: ros2-rolling-ros-base
-#       optional: true
-#   trigger:
-#     include: .gitlab-ci/ros2-rolling/ros2-rolling-desktop-full.yml
-#     strategy: depend
+ros2-rolling-ros-base:
+  stage: ROS 2 Rolling
+  rules:
+    - if: $ROS_DISTROS =~ /.*rolling.*/
+  needs:
+    - job: ros2-rolling-ros-core
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-rolling/ros2-rolling-ros-base.yml
+    strategy: depend
+
+ros2-rolling-desktop-full:
+  stage: ROS 2 Rolling
+  rules:
+    - if: $ROS_DISTROS =~ /.*rolling.*/
+  needs:
+    - job: ros2-rolling-ros-base
+      optional: true
+  trigger:
+    include: .gitlab-ci/ros2-rolling/ros2-rolling-desktop-full.yml
+    strategy: depend