diff options
| author | Eric Anholt <[email protected]> | 2020-05-05 10:44:46 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-06 18:34:38 +0000 |
| commit | 2c50176dfea360775d36cbbb02027d959db6dfaa (patch) | |
| tree | a1ed5e30b16f2ae8a47a4f9ebe9252f8f3a8bd46 /.gitlab-ci/deqp-runner.sh | |
| parent | 3b5e71cb181bae7646abe561a779b3d2062ba0cb (diff) | |
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 <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4896>
Diffstat (limited to '.gitlab-ci/deqp-runner.sh')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |