diff options
| author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-09-12 09:20:11 +0200 |
|---|---|---|
| committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-09-12 23:12:06 +0200 |
| commit | afc56ec0053342cf10b2171c63c458470bb9c461 (patch) | |
| tree | e1ffa6b868ef7ce1a91c96c5ae0f1ca1918a6f8b | |
| parent | fc543972bbddf9dafba84e7488bd0dc265eb5589 (diff) | |
dashboard-generate-squad.sh: Add full mail details in metadata
.. and fix base-artifacts sha1
Change-Id: I141a9de629c7e591a734c30ba672990c129b929f
| -rwxr-xr-x | dashboard-generate-squad.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/dashboard-generate-squad.sh b/dashboard-generate-squad.sh index d273fe53..254cd610 100755 --- a/dashboard-generate-squad.sh +++ b/dashboard-generate-squad.sh @@ -178,11 +178,13 @@ create_dashboard_files() # results-metadata.json resfile=$squaddir/$bench/results-metadata.json + local base_artifacts_url=https://git-us.linaro.org/toolchain/ci/base-artifacts.git # blanks below are used to order displayed metadata table (dirty!) cat > $resfile << EOF { " job_status": "${dbd['job_status']}", + " details": "$base_artifacts_url/plain/mail/mail-body.txt?h=${dbd['base-artifacts_branch']}&id=${dbd['base-artifacts_sha1']}", "datetime": "${dbd['datetime']}", "build_url": "${dbd['master_job_url']}", "build_log": "${dbd['master_job_url']}console", @@ -195,7 +197,6 @@ EOF [ -v dbd['linux_rev'] ] && echo " \"version_linux\": \"${dbd['linux_rev']}\"," >> "$resfile" [ -v dbd['qemu_rev'] ] && echo " \"version_qemu\": \"${dbd['qemu_rev']}\"," >> "$resfile" - local base_artifacts_url=https://git-us.linaro.org/toolchain/ci/base-artifacts.git cat >> $squaddir/$bench/results-metadata.json << EOF "artifact_results": "$base_artifacts_url/tree/?h=${dbd['base-artifacts_branch']}&id=${dbd['base-artifacts_sha1']}" } @@ -218,6 +219,9 @@ EOF *"speeds up"*) echo "Improvement(speed)" >> $resfile ;; *"reduced by"*) echo "Regression(vect)" >> $resfile ;; *"increased up by"*) echo "Improvement(vect)" >> $resfile ;; + *"failed to build"*) echo "Regression(build failed)" >> $resfile ;; + *"built OK, but failed to run"*) echo "Improvement(run still failed)" >> $resfile ;; + *"failed to run"*) echo "Regression(run failed)" >> $resfile ;; *"No change"*) echo "No change" >> $resfile ;; *) ;; # No annotation esac @@ -259,6 +263,9 @@ if [ ! -v TCWG_SQUAD_TOKEN ]; then exit 1 fi +base_artifacts_rev=\$(git show --no-patch --pretty=%h) +sed -i -e "s|#BASE-ARTIFACTS-REV#|\$base_artifacts_rev|" */results-metadata.json + EOF # If there's no squad project specified, let push cmd file as empty. @@ -341,7 +348,7 @@ dbd[master_job_url]="${BUILD_URL-$(pwd)}" dbd[base-artifacts_branch]="$baseline_branch" -dbd[base-artifacts_sha1]="$(git -C $top_artifacts show --no-patch --pretty=%h || echo '<no-revision>')" +dbd[base-artifacts_sha1]="$(git -C $top_artifacts show --no-patch --pretty=%h || echo '#BASE-ARTIFACTS-REV#')" dbd[datetime]=$run_date |