Commit 384f3a81 authored by Jonas Ådahl's avatar Jonas Ådahl Committed by Peter Hutterer
Browse files

ci-fairy: Fix typo



While it'd be neat if ci-fairy could calibrate stuff, what it does here
is ensure smooth collaboration.
Signed-off-by: Jonas Ådahl's avatarJonas Ã…dahl <jadahl@gmail.com>
parent 7ea69605
......@@ -130,7 +130,7 @@ ci-fairy images:
.ci-fairy-tag:
variables:
FDO_DISTRIBUTION_TAG: sha256-3cb21c3654a7ab78cb20e216c9ef46c4f357df22b27d243cc6751a39a6d96fb6
FDO_DISTRIBUTION_TAG: sha256-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
.ci-fairy-local-image:
extends:
......@@ -268,7 +268,7 @@ test published images:
script:
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-10-30.1
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-10-30.1
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-3cb21c3654a7ab78cb20e216c9ef46c4f357df22b27d243cc6751a39a6d96fb6
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-10-30.1
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-10-30.1
rules:
......
......@@ -19,7 +19,7 @@ ci-fairy-base-image:
.ci-fairy-tag:
variables:
FDO_DISTRIBUTION_TAG: sha256-3cb21c3654a7ab78cb20e216c9ef46c4f357df22b27d243cc6751a39a6d96fb6
FDO_DISTRIBUTION_TAG: sha256-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
# The actual ci-fairy image with ci-fairy installed
# This image uses the sha of the ci-fairy script itself as tag.
......
......@@ -31,6 +31,6 @@
# Variables provided by this template should be considered read-only.
#
.fdo.ci-fairy:
image: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-3cb21c3654a7ab78cb20e216c9ef46c4f357df22b27d243cc6751a39a6d96fb6
image: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
variables:
FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-3cb21c3654a7ab78cb20e216c9ef46c4f357df22b27d243cc6751a39a6d96fb6
\ No newline at end of file
FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
\ No newline at end of file
......@@ -1077,7 +1077,7 @@ def check_merge_request(ctx, project, merge_request_iid, junit_xml, require_allo
Checks the given merge request in the project for various settings.
Currently supported:
--require-allow-calibration: checks that the ``allow_collaboration``
--require-allow-collaboration: checks that the ``allow_collaboration``
boolean flag is set (the one that allows maintainers to rebase an
MR).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment