AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Improve the flakes reports on IRC.

Browse Source 
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@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4896>
This commit is contained in:
Eric Anholt
2020-05-05 10:44:46 -07:00
committed by Marge Bot
parent 3b5e71cb18
commit 2c50176dfe
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci/bare-metal/fastboot.sh
+2
View File
@@ -55,6 +55,8 @@ cp $BM/init.sh rootfs/init
touch rootfs/set-job-env-vars.sh touch rootfs/set-job-env-vars.sh
chmod +x rootfs/set-job-env-vars.sh chmod +x rootfs/set-job-env-vars.sh
for var in \ for var in \
CI_COMMIT_BRANCH \
CI_COMMIT_TITLE \
CI_JOB_URL \ CI_JOB_URL \
CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \ CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
CI_MERGE_REQUEST_TITLE \ CI_MERGE_REQUEST_TITLE \
.gitlab-ci/deqp-runner.sh
+3 -1
View File
@@ -111,8 +111,10 @@ report_flakes() {
echo "JOIN $channel" echo "JOIN $channel"
sleep 1 sleep 1
desc="Flakes detected in job: $CI_JOB_URL on $CI_RUNNER_DESCRIPTION" 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)" 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 fi
echo "PRIVMSG $channel :$desc" echo "PRIVMSG $channel :$desc"
for flake in `cat $flakes`; do for flake in `cat $flakes`; do