In Part 1 I've shown you how to create your own distribution image using the freedesktop.org CI templates. In Part 2, I've shown you how to truly build nested images. In this part, I'll talk about the ci-fairy tool that is part of the same repository of ci-templates.
When you're building a CI pipeline, there are some tasks that most projects need in some way or another. The ci-fairy tool is a grab-bag of solutions for these. Some of those solutions are for a pipeline itself, others are for running locally. So let's go through the various commands available.
Using ci-fairy in a pipeline
It's as simple as including the template in your .gitlab-ci.yml file.
include: - 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/master/templates/ci-fairy.yml'Of course, if you want to track a specific sha instead of following master, just sub that sha there. freedesktop.org projects can include ci-fairy like this:
include: - project: 'freedesktop/ci-templates' ref: master file: '/templates/ci-fairy.yml'Once that's done, you have access to a .fdo.ci-fairy job template that you can extends from. This will download an image from quay.io that is capable of git, python, bash and obviously ci-fairy. This image is a fixed one and referenced by a unique sha so even if where we keep working on ci-fairy upstream you should never see regression, updating requires you to explicitly update the sha of the included ci-fairy template. Obviously, if you're using master like above you'll always get the latest.
Due to how the ci-templates work, it's good to set the FDO_UPSTREAM_REPO variable with the upstream project name. This means ci-fairy will be able to find the equivalent origin/master branch, where that's not available in the merge request. Note, this is not your personal fork but the upstream one, e.g. "freedesktop/ci-templates" if you are working on the ci-templates itself.
Checking commit messages
ci-fairy has a command to check commits for a few basic expectations in commit messages. This currently includes things like enforcing a 80 char subject line length, that there is an empty line after the subject line, that no fixup or squash commits are in the history, etc. If you have complex requirements you need to write your own but for most projects this job ensures that there are no obvious errors in the git commit log:
check-commit: extends: - .fdo.ci-fairy script: - ci-fairy check-commits --signed-off-by except: - master@upstream/projectSince you don't ever want this to fail on an already merged commit, exclude this job the master branch of the upstream project - the MRs should've caught this already anyway.
Checking merge requests
To rebase a contributors merge request, the contributor must tick the checkbox to Allow commits from members who can merge to the target branch. The default value is off which is frustrating (gitlab is working on it though) and causes unnecessary delays in processing merge requests. ci-fairy has command to check for this value on an MR and fail - contributors ideally pay attention to the pipeline and fix this accordingly.
check-merge-request: extends: - .fdo.ci-fairy script: - ci-fairy check-merge-request --require-allow-collaboration allow_failure: trueAs a tip: run this job towards the end of the pipeline to give collaborators a chance to file an MR before this job fails.
Using ci-fairy locally
The two examples above are the most useful ones for CI pipelines, but ci-fairy also has some useful local commands. For that you'll have to install it, but that's as simple as
$ pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templatesA big focus on ci-fairy for local commands is that it should, usually, be able to work without any specific configuration if you run it in the repository itself.
Just hacked on the CI config?
$ ci-fairy lintand done, you get the same error back that the online linter for your project would return.
Just pushed to the repo?
$ ci-fairy wait-for-pipeline Pipeline https://gitlab.freedesktop.org/username/project/-/pipelines/238586 status: success | 7/7 | created: 0 | pending: 0 | running: 0 | failed: 0 | success: 7 ....The command is self-explanatory, I think.
There are a few other parts to ci-fairy including templating and even minio handling. I recommend looking at e.g. the libinput CI pipeline which uses much of ci-fairy's functionality. And the online documentation for ci-fairy, who knows, there may be something useful in there for you.
The useful contribution of ci-fairy is primarily that it tries to detect the settings for each project automatically, regardless of whether it's run inside a MR pipeline or just as part of a normal pipeline. So the same commands will work without custom configuration on a per-project basis. And for many things it works without API tokens, so the setup costs are just the pip install.
If you have recurring jobs, let us know, we're always looking to add more useful functionality to this little tool.
Nice. Does it integrate better with Synaptics or a Wacom tablet? 😉
Typo: "To rebase a contributors merge request": This is singular possessive (request of a contributor), so needs an apostrophe -> To rebase a contributor's merge request
Post a Comment