[gjs: 12/16] CI: Replace cpplint image build and CI job with CI templates

[Philip Chimento <pchimento src gnome org>]

commit cf05a5a750e7e7616e5eabf838ff2203a6fa50f4
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Nov 20 15:34:30 2020 -0800

    CI: Replace cpplint image build and CI job with CI templates
    
    Since we are already building a light image with linters, add cpplint to
    it as well and remove the separate Dockerfile build.

 .gitlab-ci.yml                       | 19 ++++++++++---------
 test/extra/Dockerfile.alpine.cpplint | 18 ------------------
 2 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed49e2b6..ade86eef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
 
 .gjs-alpine:
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-11-20.0'
+    FDO_DISTRIBUTION_TAG: '2020-11-20.1'
     FDO_UPSTREAM_REPO: GNOME/gjs
 
 build-alpine-image:
@@ -22,7 +22,12 @@ build-alpine-image:
     - .gjs-alpine
   stage: prepare
   variables:
-    FDO_DISTRIBUTION_PACKAGES: cppcheck yarn
+    FDO_DISTRIBUTION_PACKAGES: cppcheck git python3 yarn
+    FDO_DISTRIBUTION_EXEC: |
+      python3 -m ensurepip &&
+      rm -r /usr/lib/python*/ensurepip &&
+      pip3 install --no-cache --upgrade cpplint &&
+      mkdir -p /cwd
 
 .coverage: &coverage
   image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
@@ -171,7 +176,9 @@ cppcheck:
 cpplint:
   when: on_success
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:alpine.cpplint
+  extends:
+    - .fdo.distribution-image@alpine
+    - .gjs-alpine
   variables:
     TASK_ID: "cpplint"
   script:
@@ -358,12 +365,6 @@ zeal_11:
   BUILDAH_FORMAT: docker
   BUILDAH_ISOLATION: chroot
 
-alpine.cpplint:
-  <<: *create_docker_image
-  variables:
-    <<: *docker_variables
-    DOCKERFILE: test/extra/Dockerfile.alpine.cpplint
-
 fedora.mozjs68:
   <<: *create_docker_image
   variables: