Merge branch 'master' into rolling-support

.gitlab-ci.yml

@@ -28,11 +28,6 @@ deploy_devcontainer:
     project: tecnalia_robotics/ci_test_repos/simple_ros_test
     strategy: depend
 
-simple_ros_melodic_test:
-  extends: .simple_ros_test
-  variables:
-    TEMPLATE_TO_USE: ci-templates/auto-rules/melodic-default.yml
-
 simple_ros_noetic_test:
   extends: .simple_ros_test
   variables:
@@ -42,8 +37,3 @@ simple_ros_core_with_noetic_test:
   extends: .simple_ros_test
   variables:
     TEMPLATE_TO_USE: test/core_with_noetic.yml
-
-simple_ros_auto_rules_melodic_noetic_test:
-  extends: .simple_ros_test
-  variables:
-    TEMPLATE_TO_USE: test/auto_rules_melodic_noetic.yml

test/auto_rules_melodic_noetic.yml

-include: ci-templates/auto-rules/no-default.yml
-
-variables:
-  BUILD_MELODIC: 1
-  BUILD_NOETIC: 1

test/core_with_noetic.yml

 include: ci-templates/core.yml
 
-industrial_ci_melodic:
-  extends: .industrial_ci
-  variables:
-    ROS_DISTRO: melodic
-
 industrial_ci_noetic:
   extends: .industrial_ci
   variables: