This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a commit to branch lastwibbles in repository toolchain/semiautobench.
commit 5117f59191b5a32f0404bb7f0006159596430ba9 Author: Bernard Ogden bernie.ogden@linaro.org Date: Tue Jul 28 11:39:30 2015 +0200
Remove trailing hacking session isms
Reduce this whole thing to a couple of files
Change-Id: If06218d95c824dc1745a8738065c58d61d40de32 --- invoke_session_debian => bench-session | 24 +++++++++++++++++------- bench-session-debian.yaml => bench-session.yaml | 3 +-- setup_session_debian | 17 ----------------- stop_hacking_debian | 5 ----- 4 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/invoke_session_debian b/bench-session similarity index 91% rename from invoke_session_debian rename to bench-session index 9c0d48f..42b650a 100755 --- a/invoke_session_debian +++ b/bench-session @@ -4,6 +4,16 @@ set -o pipefail
error=1
+echo "Hostname for early debugging: $(cat /etc/hostname)" +echo "IP address for early debugging: $(hostname -I)" + +mkdir -p ~/.ssh/ +echo $1 >> ~/.ssh/authorized_keys +echo "Public Key Installed: $1" + +/etc/init.d/ssh restart +echo "sshd re-started" + function exitfunc { if test ${error} -ne 0; then if test x"${BENCH_DEBUG}" != x && test x"${BENCH_DEBUG}" != xNone; then @@ -16,20 +26,20 @@ function exitfunc {
trap exitfunc EXIT
-abe_branch="$1" +abe_branch="$2"
#these parameters used by Benchmark.job -export benchmark="${2:?Must set a benchmark}" -export toolchain="${3:?Must set a toolchain}" -if test x"$4" = xNone; then +export benchmark="${3:?Must set a benchmark}" +export toolchain="${4:?Must set a toolchain}" +if test x"$5" = xNone; then export run_flags= else - export run_flags="$4" + export run_flags="$5" fi -if test x"$5" = xNone; then +if test x"$6" = xNone; then export compiler_flags= else - export compiler_flags="$5" + export compiler_flags="$6" fi
# Set the PATH to use the LAVA api diff --git a/bench-session-debian.yaml b/bench-session.yaml similarity index 81% rename from bench-session-debian.yaml rename to bench-session.yaml index 934c8a6..307f54d 100644 --- a/bench-session-debian.yaml +++ b/bench-session.yaml @@ -35,5 +35,4 @@ install: - wget run: steps: - - ./setup_session_debian "$PUB_KEY" - - env BENCH_DEBUG="$BENCH_DEBUG" ./invoke_session_debian "$ABE_BRANCH" "$B [...] + - env BENCH_DEBUG="$BENCH_DEBUG" ./bench-session "$PUB_KEY" "$ABE_BRANCH" [...] diff --git a/setup_session_debian b/setup_session_debian deleted file mode 100755 index 0c28db2..0000000 --- a/setup_session_debian +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Usage ./setup_session <pub_key> - -echo "Hostname for early debugging: $(cat /etc/hostname)" -echo "IP address for early debugging: $(hostname -I)" - -chmod a+x stop_hacking_debian -cp stop_hacking_debian /bin/stop_hacking -chmod a+x invoke_session_debian -cp invoke_session_debian /bin/invoke_session - -mkdir -p ~/.ssh/ -echo $1 >> ~/.ssh/authorized_keys -echo "Public Key Installed: $1" - -/etc/init.d/ssh restart -echo "sshd re-started" diff --git a/stop_hacking_debian b/stop_hacking_debian deleted file mode 100755 index a872268..0000000 --- a/stop_hacking_debian +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -kill -CONT `cat /run/hacking/hacking.pid` -rm -f /run/hacking/hacking.pid -rm ~/.ssh/authorized_keys -/etc/init.d/ssh stop