Mesa (master): ci: Improve the flakes reports on IRC.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed May 6 19:01:29 UTC 2020
Module: Mesa
Branch: master
Commit: 2c50176dfea360775d36cbbb02027d959db6dfaa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c50176dfea360775d36cbbb02027d959db6dfaa
Author: Eric Anholt <eric at anholt.net>
Date: Tue May 5 10:44:46 2020 -0700
ci: Improve the flakes reports on IRC.
We were incorrectly taking the merge-request on non-MR pipelines (the
master build after merge) due to a missing '$'. And, for those pipelines,
it would be nice to note whether they're for master or a stable branch.
Reviewed-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4896>
---
.gitlab-ci/bare-metal/fastboot.sh | 2 ++
.gitlab-ci/deqp-runner.sh | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 8b0577ce082..801cb9a1407 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -55,6 +55,8 @@ cp $BM/init.sh rootfs/init
touch rootfs/set-job-env-vars.sh
chmod +x rootfs/set-job-env-vars.sh
for var in \
+ CI_COMMIT_BRANCH \
+ CI_COMMIT_TITLE \
CI_JOB_URL \
CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
CI_MERGE_REQUEST_TITLE \
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 48d95b2bedd..d2e0b592304 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -111,8 +111,10 @@ report_flakes() {
echo "JOIN $channel"
sleep 1
desc="Flakes detected in job: $CI_JOB_URL on $CI_RUNNER_DESCRIPTION"
- if [ -n "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then
+ if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then
desc="$desc on branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_MERGE_REQUEST_TITLE)"
+ elif [ -n "$CI_COMMIT_BRANCH" ]; then
+ desc="$desc on branch $CI_COMMIT_BRANCH ($CI_COMMIT_TITLE)"
fi
echo "PRIVMSG $channel :$desc"
for flake in `cat $flakes`; do
More information about the mesa-commit
mailing list