From c1a3adca1b495a1a4d83cd4412e4a443090c6a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com>
Date: Mon, 13 Sep 2021 14:35:23 +0200
Subject: [PATCH] Change includes to include:local

---
 .gitlab-industrial-ci-kinetic-no-rosinstall.yml            | 5 ++++-
 .gitlab-industrial-ci-kinetic-with-rosinstall.yml          | 5 ++++-
 auto-rules/kinetic-default.yml                             | 4 ----
 auto-rules/melodic-default.yml                             | 4 ----
 auto-rules/noetic-default.yml                              | 4 ----
 auto-rules/with-rosinstall/kinetic-default.yml             | 4 ----
 auto-rules/with-rosinstall/melodic-default.yml             | 4 ----
 auto-rules/with-rosinstall/no-default.yml                  | 6 ------
 auto-rules/with-rosinstall/noetic-default.yml              | 4 ----
 ci-templates/auto-rules/kinetic-default.yml                | 4 ++++
 ci-templates/auto-rules/melodic-default.yml                | 4 ++++
 {auto-rules => ci-templates/auto-rules}/no-default.yml     | 2 +-
 ci-templates/auto-rules/noetic-default.yml                 | 4 ++++
 .../auto-rules/with-rosinstall/kinetic-default.yml         | 4 ++++
 .../auto-rules/with-rosinstall/melodic-default.yml         | 4 ++++
 ci-templates/auto-rules/with-rosinstall/no-default.yml     | 6 ++++++
 ci-templates/auto-rules/with-rosinstall/noetic-default.yml | 4 ++++
 core.yml => ci-templates/core.yml                          | 7 ++-----
 .../industrial-ci-templates.yml                            | 0
 post-check.yml => ci-templates/post-check.yml              | 0
 20 files changed, 41 insertions(+), 38 deletions(-)
 delete mode 100644 auto-rules/kinetic-default.yml
 delete mode 100644 auto-rules/melodic-default.yml
 delete mode 100644 auto-rules/noetic-default.yml
 delete mode 100644 auto-rules/with-rosinstall/kinetic-default.yml
 delete mode 100644 auto-rules/with-rosinstall/melodic-default.yml
 delete mode 100644 auto-rules/with-rosinstall/no-default.yml
 delete mode 100644 auto-rules/with-rosinstall/noetic-default.yml
 create mode 100644 ci-templates/auto-rules/kinetic-default.yml
 create mode 100644 ci-templates/auto-rules/melodic-default.yml
 rename {auto-rules => ci-templates/auto-rules}/no-default.yml (94%)
 create mode 100644 ci-templates/auto-rules/noetic-default.yml
 create mode 100644 ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
 create mode 100644 ci-templates/auto-rules/with-rosinstall/melodic-default.yml
 create mode 100644 ci-templates/auto-rules/with-rosinstall/no-default.yml
 create mode 100644 ci-templates/auto-rules/with-rosinstall/noetic-default.yml
 rename core.yml => ci-templates/core.yml (76%)
 rename industrial-ci-templates.yml => ci-templates/industrial-ci-templates.yml (100%)
 rename post-check.yml => ci-templates/post-check.yml (100%)

diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 75393ed..26a2a73 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -1 +1,4 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/kinetic-default.yml'
\ No newline at end of file
+include:
+  - 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
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index bddac0a..57165c5 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1 +1,4 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/kinetic-default.yml'
\ No newline at end of file
+include:
+  - 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
diff --git a/auto-rules/kinetic-default.yml b/auto-rules/kinetic-default.yml
deleted file mode 100644
index 0c04cd5..0000000
--- a/auto-rules/kinetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/auto-rules/melodic-default.yml b/auto-rules/melodic-default.yml
deleted file mode 100644
index 023a8ea..0000000
--- a/auto-rules/melodic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/auto-rules/noetic-default.yml b/auto-rules/noetic-default.yml
deleted file mode 100644
index 8239a71..0000000
--- a/auto-rules/noetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/auto-rules/with-rosinstall/kinetic-default.yml b/auto-rules/with-rosinstall/kinetic-default.yml
deleted file mode 100644
index 20f6e8a..0000000
--- a/auto-rules/with-rosinstall/kinetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/auto-rules/with-rosinstall/melodic-default.yml b/auto-rules/with-rosinstall/melodic-default.yml
deleted file mode 100644
index 69519f9..0000000
--- a/auto-rules/with-rosinstall/melodic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/auto-rules/with-rosinstall/no-default.yml b/auto-rules/with-rosinstall/no-default.yml
deleted file mode 100644
index ab36dd9..0000000
--- a/auto-rules/with-rosinstall/no-default.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-
-.industrial_ci:
-  variables:
-    UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
diff --git a/auto-rules/with-rosinstall/noetic-default.yml b/auto-rules/with-rosinstall/noetic-default.yml
deleted file mode 100644
index bf3d10c..0000000
--- a/auto-rules/with-rosinstall/noetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/ci-templates/auto-rules/kinetic-default.yml b/ci-templates/auto-rules/kinetic-default.yml
new file mode 100644
index 0000000..7bc72b9
--- /dev/null
+++ b/ci-templates/auto-rules/kinetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: kinetic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/melodic-default.yml b/ci-templates/auto-rules/melodic-default.yml
new file mode 100644
index 0000000..62379b9
--- /dev/null
+++ b/ci-templates/auto-rules/melodic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: melodic
\ No newline at end of file
diff --git a/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
similarity index 94%
rename from auto-rules/no-default.yml
rename to ci-templates/auto-rules/no-default.yml
index 85581fb..8596c1b 100644
--- a/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -1,4 +1,4 @@
-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:
diff --git a/ci-templates/auto-rules/noetic-default.yml b/ci-templates/auto-rules/noetic-default.yml
new file mode 100644
index 0000000..f35658b
--- /dev/null
+++ b/ci-templates/auto-rules/noetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: noetic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
new file mode 100644
index 0000000..fe99b53
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: kinetic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/melodic-default.yml b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
new file mode 100644
index 0000000..47e501b
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: melodic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/no-default.yml b/ci-templates/auto-rules/with-rosinstall/no-default.yml
new file mode 100644
index 0000000..f4735f5
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/no-default.yml
@@ -0,0 +1,6 @@
+include : ci-templates/auto-rules/no-default.yml
+
+
+.industrial_ci:
+  variables:
+    UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/noetic-default.yml b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
new file mode 100644
index 0000000..0d83acd
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: noetic
\ No newline at end of file
diff --git a/core.yml b/ci-templates/core.yml
similarity index 76%
rename from core.yml
rename to ci-templates/core.yml
index 6f71cf5..b333e00 100644
--- a/core.yml
+++ b/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
 
diff --git a/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
similarity index 100%
rename from industrial-ci-templates.yml
rename to ci-templates/industrial-ci-templates.yml
diff --git a/post-check.yml b/ci-templates/post-check.yml
similarity index 100%
rename from post-check.yml
rename to ci-templates/post-check.yml
-- 
GitLab