summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2016-10-03 03:46:03 -0700
committerStuart Monteith <stuart.monteith@linaro.org>2016-10-03 03:46:03 -0700
commitd66f6207080337015c7f877e3a8a0334580e8183 (patch)
treee70a08d6bc78125f59a2f67ed40b0bd25766e0bf
parent273d264051f6019303dfcee7e5531edd9bb8dd5f (diff)
Use PUBLISH_HOST variable instead of ssh-config
Use an environment variable instead of an ssh config. The jenkins servers shouldn't have their ssh configs altered.
-rwxr-xr-xbenchmark-terasort-publish6
-rw-r--r--common.sh1
2 files changed, 4 insertions, 3 deletions
diff --git a/benchmark-terasort-publish b/benchmark-terasort-publish
index b6050d5..9f3c595 100755
--- a/benchmark-terasort-publish
+++ b/benchmark-terasort-publish
@@ -34,11 +34,11 @@ source ${THIS_BENCHMARK_DIR}/common.sh
$THIS_BENCHMARK_DIR/update-results-db
d=$1/$(basename $BENCHMARK_RESULTS_DIR)
-ssh publish-host mkdir -p $d
+ssh ${PUBLISH_HOST} mkdir -p $d
update-results-db
results_file=$(mktemp /tmp/historic-results-XXXXXX.html)
trap "rm -f $results_file" EXIT
print-historic-results > $results_file
chmod 644 $results_file
-scp $results_file publish-host:$d/index.html
-scp $THIS_BENCHMARK_DIR/*.css publish-host:$d
+scp $results_file ${PUBLISH_HOST}:$d/index.html
+scp $THIS_BENCHMARK_DIR/*.css ${PUBLISH_HOST}:$d
diff --git a/common.sh b/common.sh
index 1c9aa0b..103ca6c 100644
--- a/common.sh
+++ b/common.sh
@@ -28,5 +28,6 @@ set -a
: ${RESULTS_FILE:=$BENCHMARK_RESULTS_DIR/results.csv}
: ${RESULTS_DB:=$BENCHMARK_RESULTS_DIR/results.db}
: ${TERAGEN_BASELINE_DIR:=$HOME/hadoop-terasort-reference-files}
+: ${PUBLISH_HOST:=stuart.monteith@people.linaro.org}
set +a