From 5d7eed79e9e0ae84f20ecb8ecfd577eb69dd826d Mon Sep 17 00:00:00 2001
From: Dmytro Bogatov <dmytro@dbogatov.org>
Date: Sat, 23 Feb 2019 17:55:26 -0500
Subject: [PATCH] Update CI for better include syntax.

---
 .gitlab-ci.yml | 74 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70460ce..32f8d71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,33 +17,61 @@ variables:
   # username is always "review" (without quotes)
 
 include:
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/before-script.yml'
+  # BEFORE SCRIPT
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/before-script.yml'
 
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/tidy.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/blc.yml'
+  # BUILD
+  - project: 'templates/ci-snippets'
+    file: 'empty-build.yml'
 
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/review/build-review.yml'
+  # TEST
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/tidy.yml'
 
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/review/review.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/review/stop-review.yml'
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/blc.yml'
 
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/code-quality.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/sast.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/deps-scan.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/container-scan.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/dast.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/license-check.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/performance.yml'
+  # BUILD-REVIEW
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/build-review.yml'
 
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/release-docker.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/pages.yml'
+  # REVIEW
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/review.yml'
 
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/trigger-websites-deploy.yml'
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/stop-review.yml'
 
-build:
-  image: dbogatov/docker-images:alpine-extras-latest
-  stage: build
-  script:
-  - echo "Build"
-  tags:
-  - docker
+  # CODE QUALITY
+  - project: 'templates/ci-snippets'
+    file: 'quality-security/code-quality..yml'
+
+  - project: 'templates/ci-snippets'
+    file: 'quality-security/sast.yml'
+
+  - project: 'templates/ci-snippets'
+    file: 'quality-security/deps-scan.yml'
+
+  - project: 'templates/ci-snippets'
+    file: 'quality-security/container-scan.yml'
+
+  - project: 'templates/ci-snippets'
+    file: 'quality-security/dast.yml'
+
+  - project: 'templates/ci-snippets'
+    file: 'quality-security/license-check.yml'
+
+  - project: 'templates/ci-snippets'
+    file: 'quality-security/performance.yml'
+
+  # RELEASE
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/release-docker.yml'
+
+  - project: 'templates/ci-snippets'
+    file: 'simple-website/pages.yml'
+
+  # DEPLOY
+  - project: 'templates/ci-snippets'
+    file: 'trigger-websites-deploy.yml'
-- 
GitLab