From b7df846a8bc1ddfd40363277957960d9f642fe0c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 23 Nov 2020 13:13:09 +1000
Subject: [PATCH] gitlab CI: use the CI-fairy image

This removes the need to pull a docker image for each of those stages.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml         | 19 ++++++++-----------
 .gitlab-ci/ci.template | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5ad9d4..c5e14e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@
 # <distribution>:<version>@activity:
 #  e.g. fedora:31@build-default
 
-.templates_sha: &template_sha 4f06663cd1507136a0f8440925a2521098adb298 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   # Alpine container builder template
@@ -53,6 +53,9 @@ include:
   - project: 'freedesktop/ci-templates'
     ref: *template_sha
     file: '/templates/ubuntu.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
 
 stages:
   - prep             # prep work like rebuilding the container images if there is a change
@@ -127,12 +130,6 @@ variables:
       junit: $MESON_BUILDDIR/junit-*.xml
 
 
-.ci_fairy_image:
-  image: python:alpine
-  before_script:
-    - apk add git
-    - pip install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
-
 #################################################################
 #                                                               #
 #                          prep stage                           #
@@ -145,7 +142,7 @@ variables:
 #
 check-ci-script:
   extends:
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: prep
   script:
     - ci-fairy generate-template
@@ -159,7 +156,7 @@ check-ci-script:
 
 check-commit:
   extends:
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: prep
   script:
     - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
@@ -177,7 +174,7 @@ check-commit:
 
 check-merge-request:
   extends:
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: deploy
   script:
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
@@ -350,7 +347,7 @@ freebsd:11.2@container-prep:
 .container-clean:
   extends:
     - .policy
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: container_clean
   script:
     # Go to your Profile, Settings, Access Tokens
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 100d635..d9eb718 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -32,7 +32,7 @@
 # <distribution>:<version>@activity:
 #  e.g. fedora:31@build-default
 
-.templates_sha: &template_sha 4f06663cd1507136a0f8440925a2521098adb298 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   {% for distro in distributions|sort(attribute="name") %}
@@ -43,6 +43,9 @@ include:
     file: '/templates/{{distro.name}}.yml'
   {% endif %}
   {% endfor %}
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
 
 stages:
   - prep             # prep work like rebuilding the container images if there is a change
@@ -115,12 +118,6 @@ variables:
       junit: $MESON_BUILDDIR/junit-*.xml
 
 
-.ci_fairy_image:
-  image: python:alpine
-  before_script:
-    - apk add git
-    - pip install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
-
 #################################################################
 #                                                               #
 #                          prep stage                           #
@@ -133,7 +130,7 @@ variables:
 #
 check-ci-script:
   extends:
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: prep
   script:
     - ci-fairy generate-template
@@ -147,7 +144,7 @@ check-ci-script:
 
 check-commit:
   extends:
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: prep
   script:
     - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
@@ -165,7 +162,7 @@ check-commit:
 
 check-merge-request:
   extends:
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: deploy
   script:
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
@@ -280,7 +277,7 @@ freebsd:11.2@container-prep:
 .container-clean:
   extends:
     - .policy
-    - .ci_fairy_image
+    - .fdo.ci-fairy
   stage: container_clean
   script:
     # Go to your Profile, Settings, Access Tokens
-- 
2.7.4