Move the CI files into .gitlab-ci subfolder

This helps having a cleaner environment
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>

.gitlab-ci.yml

@@ -14,7 +14,7 @@ include:
   #   file: '/templates/alpine.yml'
   #
   - local: '/templates/alpine.yml'
-  - local: '/alpine-ci.yml'
+  - local: '/.gitlab-ci/alpine-ci.yml'
 
   # Arch container builder template
   # projects using this should reference this with the following:
@@ -24,7 +24,7 @@ include:
   #   file: '/templates/arch.yml'
   #
   - local: '/templates/arch.yml'
-  - local: '/arch-ci.yml'
+  - local: '/.gitlab-ci/arch-ci.yml'
 
   # Centos container builder template
   # projects using this should reference this with the following:
@@ -34,7 +34,7 @@ include:
   #   file: '/templates/centos.yml'
   #
   - local: '/templates/centos.yml'
-  - local: '/centos-ci.yml'
+  - local: '/.gitlab-ci/centos-ci.yml'
 
   # Debian container builder template
   # projects using this should reference this with the following:
@@ -44,7 +44,7 @@ include:
   #   file: '/templates/debian.yml'
   #
   - local: '/templates/debian.yml'
-  - local: '/debian-ci.yml'
+  - local: '/.gitlab-ci/debian-ci.yml'
 
   # Fedora container builder template
   # projects using this should reference this with the following:
@@ -54,7 +54,7 @@ include:
   #   file: '/templates/fedora.yml'
   #
   - local: '/templates/fedora.yml'
-  - local: '/fedora-ci.yml'
+  - local: '/.gitlab-ci/fedora-ci.yml'
 
   # Ubuntu container builder template
   # projects using this should reference this with the following:
@@ -64,7 +64,7 @@ include:
   #   file: '/templates/ubuntu.yml'
   #
   - local: '/templates/ubuntu.yml'
-  - local: '/ubuntu-ci.yml'
+  - local: '/.gitlab-ci/ubuntu-ci.yml'
 
 variables:
   BOOTSTRAP_TAG: '2020-03-11'

src/generate_templates.py

@@ -62,8 +62,10 @@ if __name__ == '__main__':
     template_ci = env.get_template('template-ci.tmpl')
 
     out_folder = Path('templates')
-    if not out_folder.exists():
-        os.mkdir(out_folder)
+    out_folder.mkdir(exist_ok=True)
+
+    ci_folder = Path('.gitlab-ci')
+    ci_folder.mkdir(exist_ok=True)
 
     # define a generator for the list of scripts to be run in each distribution
     def get_script():
@@ -78,7 +80,7 @@ if __name__ == '__main__':
     # and render each distribution in the templates source directory
     for distrib, config in sorted(config_data.items()):
         dest = out_folder / f'{distrib}.yml'
-        dest_ci = f'{distrib}-ci.yml'
+        dest_ci = ci_folder / f'{distrib}-ci.yml'
 
         # use the next script for this config
         config['script'] = next(scripts)

src/gitlab-ci.tmpl

@@ -15,7 +15,7 @@ include:
   #   file: '/templates/{{ distribution }}.yml'
   #
   - local: '/templates/{{ distribution }}.yml'
-  - local: '/{{ distribution }}-ci.yml'
+  - local: '/.gitlab-ci/{{ distribution }}-ci.yml'
 {% endfor %}
 
 variables: