diff options
| author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-09-14 18:38:46 +0200 |
|---|---|---|
| committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-09-14 18:42:46 +0200 |
| commit | a07d761881eae940dcf17b0dc7e8bf7e123038f2 (patch) | |
| tree | ce43426a985c1921c5fc4f322d93c4d796ae9f69 | |
| parent | c4afa25758d0b533f058582010b889d7fcc6ef58 (diff) | |
round-robin.sh,dashboard-generate-squad.sh: Temporary fix for dashboard push
.. waiting for a better solution not using sha1
Change-Id: I39327a9e60f96cc1a091e96b70caacd52588630f
| -rwxr-xr-x | dashboard-generate-squad.sh | 8 | ||||
| -rw-r--r-- | round-robin.sh | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/dashboard-generate-squad.sh b/dashboard-generate-squad.sh index 8efd8ef0..61653614 100755 --- a/dashboard-generate-squad.sh +++ b/dashboard-generate-squad.sh @@ -267,8 +267,12 @@ if [ ! -v TCWG_SQUAD_TOKEN ]; then exit 1 fi -base_artifacts_rev=\$(git show --no-patch --pretty=%h||echo "<no-revision>") -sed -i -e "s|#BASE-ARTIFACTS-REV#|\$base_artifacts_rev|" */results-metadata.json +top_artifacts=\$(pwd)/../.. +if [ -f $top_artifacts/git/base-artifacts_rev ]; then + base_artifacts_rev=$(cat \$top_artifacts/git/base-artifacts_rev) + sed -i -e "s|#BASE-ARTIFACTS-REV#|\$base_artifacts_rev|" */results-metadata.json +fi + EOF diff --git a/round-robin.sh b/round-robin.sh index 63c06d62..452b6973 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -1313,5 +1313,9 @@ $(cat ${rr[top_artifacts]}/mail/mail-body.txt)" git -C base-artifacts push --force baseline HEAD:refs/heads/${rr[baseline_branch]} EOF chmod +x ${rr[top_artifacts]}/jenkins/git-push.sh + + # Add base-artifacts git revision in artifacts, useful for dashboard-push.sh stage + echo "https://git-us.linaro.org/toolchain/ci/base-artifacts.git" > ${rr[top_artifacts]}/git/base-artifacts_url + git -C base-artifacts rev-parse HEAD > ${rr[top_artifacts]}/git/base-artifacts_rev ) } |