summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2018-06-28 19:47:54 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2018-06-29 08:58:04 +0530
commit1593bbb215aec98e1f3a0719834269128d093806 (patch)
tree754697c7dc583f31239dd1f9d9166d68c40bbe3b
parent270a6d86253d6a7860c5ad7d3c2019dcda9fe68e (diff)
microbenchmarks: decouple art-report submission
Change-Id: I3b63126579c6e17410522fde8712a330ea5c74f7 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rwxr-xr-xautomated/android/microbenchmarks/microbenchmarks.sh17
-rw-r--r--automated/android/microbenchmarks/microbenchmarks.yaml3
2 files changed, 12 insertions, 8 deletions
diff --git a/automated/android/microbenchmarks/microbenchmarks.sh b/automated/android/microbenchmarks/microbenchmarks.sh
index 28be5fb..c5c308e 100755
--- a/automated/android/microbenchmarks/microbenchmarks.sh
+++ b/automated/android/microbenchmarks/microbenchmarks.sh
@@ -15,8 +15,9 @@ lava_test_dir="$(find /lava-* -maxdepth 0 -type d -regex '/lava-[0-9]+' 2>/dev/n
if test -f "${lava_test_dir}/secrets" && grep -q "ART_TOKEN" "${lava_test_dir}/secrets"; then
# shellcheck disable=SC1090
. "${lava_test_dir}/secrets"
+ export ART_TOKEN
+ export ARTIFACTORIAL_TOKEN
fi
-export ART_TOKEN
set -x
# shellcheck disable=SC1091
@@ -72,8 +73,12 @@ sed -i "s| /data/art-test| /data/art-test > /dev/null|g" scripts/benchmarks/benc
sed -i "s|mode \"\$1\"|mode \"\$1\" --noverbose|g" scripts/benchmarks/benchmarks_run_target.sh
export OUT=${PWD}/out/target/product/${LUNCH_TARGET}/
./scripts/benchmarks/benchmarks_run_target.sh --skip-build true --iterations "${ITERATIONS}" --mode "${MODE}"
-git clone https://git.linaro.org/people/vishal.bhoj/pbr.git; mkdir -p pbr/artifacts/
-cp ./*.json pbr/artifacts/
-wget "${SNAPSHOTS_URL}"/pinned-manifest.xml -O pbr/artifacts/pinned-manifest.xml
-cd pbr || exit
-python post-build-report.py
+
+if [ ! -z "${ART_TOKEN}" ]; then
+ git clone https://git.linaro.org/people/vishal.bhoj/pbr.git; mkdir -p pbr/artifacts/
+ cp ./*.json pbr/artifacts/
+ wget "${SNAPSHOTS_URL}"/pinned-manifest.xml -O pbr/artifacts/pinned-manifest.xml
+ cd pbr || exit
+ python post-build-report.py
+ tar -cJf artifacts.txz artifacts/
+fi
diff --git a/automated/android/microbenchmarks/microbenchmarks.yaml b/automated/android/microbenchmarks/microbenchmarks.yaml
index af58902..0208cc3 100644
--- a/automated/android/microbenchmarks/microbenchmarks.yaml
+++ b/automated/android/microbenchmarks/microbenchmarks.yaml
@@ -37,5 +37,4 @@ run:
steps:
- cd ./automated/android/microbenchmarks
- . ./microbenchmarks.sh -s false
- - tar -cJf artifacts.txz artifacts/
- - ../../../../utils/upload-to-artifactorial.sh -a artifacts.txz -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}"
+ - if [ ! -z ${ARTIFACTORIAL_TOKEN} ]; then ../../../../utils/upload-to-artifactorial.sh -a artifacts.txz -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}"; fi