gitlab CI: update to new templates

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 67 insertions, 9 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80732c5..58e5de9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,22 @@
-# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0:
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
+#
+# This CI uses the freedesktop.org ci-templates.
+# Please see the ci-templates documentation for details:
+# https://freedesktop.pages.freedesktop.org/ci-templates/
+
+.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
 
 include:
   # Arch container builder template
   - project: 'freedesktop/ci-templates'
-    ref: 6f86b8bcb0cd5168c32779c4fea9a893c4a0c046
-    file:
-      - '/templates/arch.yml'
+    ref: *template_sha
+    file: '/templates/arch.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
 
 # global variables to be used by most/all jobs.
 variables:
@@ -13,23 +24,69 @@ variables:
   # Changing the tag will rebuild the container images. The value is just a
   # string, but we use the date for human benefits.
   FDO_DISTRIBUTION_TAG: '2021-01-20.0'
+  # minimal set of packages required to build and install
+  BASE_PACKAGES: 'pkgconf autoconf automake make gcc bison libxkbfile libx11 xorg-util-macros'
+  # extra packages we need for various tests
+  EXTRA_PACKAGES: ''
+  FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $EXTRA_PACKAGES
+
 
 stages:
   - prep
   - build
+  - test
+  - deploy
+
+
+#
+# Verify that commit messages are as expected, signed-off, etc.
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  stage: prep
+  script:
+    - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
+  except:
+    - master@xorg/app/xkbcomp
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+  extends:
+    - .fdo.ci-fairy
+  stage: deploy
+  script:
+    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
+  artifacts:
+    when: on_failure
+    reports:
+      junit: results.xml
+  allow_failure: true
 
+
+#
+# Build a container with the given tag and the packages pre-installed.
+# This only happens if when the tag changes, otherwise the existing image is
+# re-used.
+#
 container-prep:
   extends:
     - .fdo.container-build@arch
   stage: prep
   variables:
     GIT_STRATEGY: none
-    # minimal set of packages required to build and install
-    BASE_PACKAGES: 'pkgconf autoconf automake make gcc bison libxkbfile libx11 xorg-util-macros'
-    # extra packages we need for various tests
-    EXTRA_PACKAGES: ''
-    FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $EXTRA_PACKAGES
 
+
+#
+# The default build, runs on the image built above.
+#
 autotools:
   extends:
     - .fdo.distribution-image@arch
@@ -41,3 +98,4 @@ autotools:
     - make
     - make check
     - make install
+    - make distcheck