summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Alfonsi <laurent.alfonsi@linaro.org>2022-09-15 11:23:53 +0200
committerLaurent Alfonsi <laurent.alfonsi@linaro.org>2022-09-15 11:23:53 +0200
commit66a3b0b9e010205cd5206348225ca4496c86bf72 (patch)
tree4948e5f583dfcce1c7fe75ad38fd4a804c1d3d20
parent1f768df100e84382e765c26dae737603cfd17de2 (diff)
dashboard-generate-squad.sh: Fix again
Change-Id: I385dae451373cd2f21ada1d1c4e625df585dbf9c
-rwxr-xr-xdashboard-generate-squad.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/dashboard-generate-squad.sh b/dashboard-generate-squad.sh
index 278c083f..94c275ba 100755
--- a/dashboard-generate-squad.sh
+++ b/dashboard-generate-squad.sh
@@ -254,8 +254,7 @@ EOF
#!/bin/bash
cd \$(dirname \$0)
-set +x
-set -e
+set -ex
squad_server=$squad_server
@@ -269,11 +268,14 @@ if [ ! -v TCWG_SQUAD_TOKEN ]; then
fi
top_artifacts=\$(pwd)/../..
-if [ -f $top_artifacts/git/base-artifacts_rev ]; then
+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
+echo "Uploading results to $squad_server/$grp/$prj/$bld"
+
+set +x
EOF
@@ -295,7 +297,7 @@ EOF
cat >> $pushcmdfile << EOF
echo "pushing $squad_url"
-curl --header "Authorization: Token \$TCWG_SQUAD_TOKEN" \\
+curl --silent --header "Authorization: Token \$TCWG_SQUAD_TOKEN" \\
--form tests=@$results_results \\
--form metrics=@$results_metrics \\
--form metadata=@$results_metadata \\