Commit f830873d authored by Florian Muellner's avatar Florian Muellner
Browse files

ci_fairy: Include commit SHA in junit error



It is already included in the testsuite name, but that isn't shown
in gitlab's UI, with the result that the front-page error report
is often useless and the user has to check out the pipeline logs.
Signed-off-by: Florian Muellner's avatarFlorian Müllner <fmuellner@gnome.org>
parent db8eb22c
Pipeline #277315 passed with stages
in 2 minutes and 54 seconds
...@@ -166,7 +166,7 @@ ci-fairy images: ...@@ -166,7 +166,7 @@ ci-fairy images:
.ci-fairy-tag: .ci-fairy-tag:
variables: variables:
FDO_DISTRIBUTION_TAG: sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1 FDO_DISTRIBUTION_TAG: sha256-b76681d87ea9b06907f7828206a1f99d06a9821dc86c797768736b28509e32b5
.ci-fairy-local-image: .ci-fairy-local-image:
extends: extends:
...@@ -307,7 +307,7 @@ test published images: ...@@ -307,7 +307,7 @@ test published images:
script: script:
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-18.2 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-18.2 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-b76681d87ea9b06907f7828206a1f99d06a9821dc86c797768736b28509e32b5
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0
rules: rules:
......
...@@ -23,7 +23,7 @@ ci-fairy-base-image: ...@@ -23,7 +23,7 @@ ci-fairy-base-image:
.ci-fairy-tag: .ci-fairy-tag:
variables: variables:
FDO_DISTRIBUTION_TAG: sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1 FDO_DISTRIBUTION_TAG: sha256-b76681d87ea9b06907f7828206a1f99d06a9821dc86c797768736b28509e32b5
# The actual ci-fairy image with ci-fairy installed # The actual ci-fairy image with ci-fairy installed
# This image uses the sha of the ci-fairy script itself as tag. # This image uses the sha of the ci-fairy script itself as tag.
......
...@@ -31,6 +31,6 @@ ...@@ -31,6 +31,6 @@
# Variables provided by this template should be considered read-only. # Variables provided by this template should be considered read-only.
# #
.fdo.ci-fairy: .fdo.ci-fairy:
image: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1 image: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-b76681d87ea9b06907f7828206a1f99d06a9821dc86c797768736b28509e32b5
variables: variables:
FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1 FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-b76681d87ea9b06907f7828206a1f99d06a9821dc86c797768736b28509e32b5
\ No newline at end of file \ No newline at end of file
...@@ -279,7 +279,7 @@ class GitCommitValidator(object): ...@@ -279,7 +279,7 @@ class GitCommitValidator(object):
msg = '\n\n'.join([f'{idx + 1}. {err}' for idx, err in enumerate(self.errors)]) msg = '\n\n'.join([f'{idx + 1}. {err}' for idx, err in enumerate(self.errors)])
return (str(self.commit), return (str(self.commit),
f'Failed {len(self.errors)} commit message checks', f'{str(self.commit)[:8]} failed {len(self.errors)} commit message checks',
msg) msg)
......
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