diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2021-11-28 17:30:33 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2021-11-28 17:31:56 -0800 |
| commit | f7ae6067fd186c22c4cc0a3b57d776e492a520b1 (patch) | |
| tree | f5101abad6d90dad52c3b18e14eb11955dbb8d43 | |
| parent | 0d8629839550c50edcf648a1f4391d3f2bb56b1d (diff) | |
gitlab CI: Use ci-fairy image template
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24de053..cf592c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ # Please see the ci-templates documentation for details: # https://freedesktop.pages.freedesktop.org/ci-templates/ -.templates_sha: &template_sha c7702b1ae8507c5d5f34edcbf280f287ab541e8e # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: @@ -12,6 +12,9 @@ include: - project: 'freedesktop/ci-templates' ref: *template_sha file: '/templates/arch.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' stages: @@ -30,20 +33,11 @@ variables: # -# Template for an image with ci-fairy installed -# -.ci_fairy_image: - image: python:alpine - before_script: - - apk add git - - pip install git+http://gitlab.freedesktop.org/freedesktop/ci-templates - -# # Verify that commit messages are as expected, signed-off, etc. # check-commits: extends: - - .ci_fairy_image + - .fdo.ci-fairy stage: prep script: - ci-fairy check-commits --signed-off-by --junit-xml=results.xml @@ -60,7 +54,7 @@ check-commits: # 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 |