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

ci-fairy: Fix caught exception type when checking collaboration



It's an AttributeError, not KeyError, being thrown.
Signed-off-by: Jonas Ådahl's avatarJonas Ã…dahl <jadahl@gmail.com>
parent 384f3a81
Pipeline #232675 passed with stages
in 22 minutes and 55 seconds
......@@ -130,7 +130,7 @@ ci-fairy images:
.ci-fairy-tag:
variables:
FDO_DISTRIBUTION_TAG: sha256-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
FDO_DISTRIBUTION_TAG: sha256-013647d5a12ccb5c793db389998069c95cf35875f6dd7d24911f9a09bf7bf9f0
.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-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-013647d5a12ccb5c793db389998069c95cf35875f6dd7d24911f9a09bf7bf9f0
- 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-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
FDO_DISTRIBUTION_TAG: sha256-013647d5a12ccb5c793db389998069c95cf35875f6dd7d24911f9a09bf7bf9f0
# 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-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
image: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-013647d5a12ccb5c793db389998069c95cf35875f6dd7d24911f9a09bf7bf9f0
variables:
FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-4fb70ecc069b1139e23e8480e13fde627861bdab17b42194c1a0af5d6d2bf741
\ No newline at end of file
FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-013647d5a12ccb5c793db389998069c95cf35875f6dd7d24911f9a09bf7bf9f0
\ No newline at end of file
......@@ -1173,7 +1173,7 @@ def check_merge_request(ctx, project, merge_request_iid, junit_xml, require_allo
See https://docs.gitlab.com/ce/user/project/merge_requests/allow_collaboration.html'''
failures.append((tcaseid, tcasename, message))
logger.error(message)
except KeyError:
except AttributeError:
# filing an MR against master in your own personal repo
# doesn't have that checkbox
pass
......
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