Change includes to include:local

.gitlab-industrial-ci-kinetic-no-rosinstall.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/kinetic-default.yml'
+include:
\ No newline at end of file
+  - project: tecnalia_robotics-public/gitlab_templates
+    ref: 35-improve-ci-template-organization
+    file: ci-templates/auto-rules/kinetic-default.yml
\ No newline at end of file

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/kinetic-default.yml'
+include:
\ No newline at end of file
+  - project: tecnalia_robotics-public/gitlab_templates
+    ref: 35-improve-ci-template-organization
+    file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
\ No newline at end of file

auto-rules/kinetic-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: kinetic
\ No newline at end of file

auto-rules/melodic-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: melodic
\ No newline at end of file

auto-rules/noetic-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: noetic
\ No newline at end of file

auto-rules/with-rosinstall/kinetic-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: kinetic
\ No newline at end of file

auto-rules/with-rosinstall/melodic-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: melodic
\ No newline at end of file

auto-rules/with-rosinstall/noetic-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: noetic
\ No newline at end of file

ci-templates/auto-rules/kinetic-default.yml

+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: kinetic
\ No newline at end of file

ci-templates/auto-rules/melodic-default.yml

+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: melodic
\ No newline at end of file

auto-rules/no-default.yml → ci-templates/auto-rules/no-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/core.yml'
+include : ci-templates/core.yml
 
 workflow:
   rules:

ci-templates/auto-rules/noetic-default.yml

+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: noetic
\ No newline at end of file

ci-templates/auto-rules/with-rosinstall/kinetic-default.yml

+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: kinetic
\ No newline at end of file

ci-templates/auto-rules/with-rosinstall/melodic-default.yml

+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: melodic
\ No newline at end of file

auto-rules/with-rosinstall/no-default.yml → ci-templates/auto-rules/with-rosinstall/no-default.yml

-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
+include : ci-templates/auto-rules/no-default.yml
 
 
 .industrial_ci:

ci-templates/auto-rules/with-rosinstall/noetic-default.yml

+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: noetic
\ No newline at end of file

core.yml → ci-templates/core.yml

@@ -23,9 +23,6 @@ before_script:
   - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
 
 include :
-  - project: tecnalia_robotics-public/gitlab_templates
-    ref: 35-improve-ci-template-organization
-    file:
-      - post-check.yml
-      - industrial-ci-templates.yml
+  - ci-templates/post-check.yml
+  - ci-templates/industrial-ci-templates.yml