diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac694c3ff28d0e9bc206a71a0d297e9e8026d358..3ecddc7b9c49289318fe07088a9c51afa6aa865d 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/test/auto_rules_melodic_noetic.yml b/test/auto_rules_melodic_noetic.yml deleted file mode 100644 index 26e5143d807ccf67eef87c99cac615e3e5beb39e..0000000000000000000000000000000000000000 --- a/test/auto_rules_melodic_noetic.yml +++ /dev/null @@ -1,5 +0,0 @@ -include: ci-templates/auto-rules/no-default.yml - -variables: - BUILD_MELODIC: 1 - BUILD_NOETIC: 1 diff --git a/test/core_with_noetic.yml b/test/core_with_noetic.yml index ce063ed55bc62ed643bddd27a45f9359ac3af735..b1e2422327346d63f544537b9e0d43b6b112ca0a 100644 --- a/test/core_with_noetic.yml +++ b/test/core_with_noetic.yml @@ -1,10 +1,5 @@ include: ci-templates/core.yml -industrial_ci_melodic: - extends: .industrial_ci - variables: - ROS_DISTRO: melodic - industrial_ci_noetic: extends: .industrial_ci variables: