This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a commit to branch remove_hackingisms in repository toolchain/semiautobench.
commit 72b93b910ee6e46ecab6ce54126adc4555e7b756 Author: Bernard Ogden bernie.ogden@linaro.org Date: Mon Jul 27 12:33:16 2015 +0200
Move early IP report to first script
This is even earlier, and de-pollutes the main script a little.
Change-Id: I6dd6276190cad4af1c17b1c1ec78ed0627133bc0 --- bench-session-debian.yaml | 3 +-- invoke_session_debian | 22 ++++++++-------------- setup_session_debian | 5 +++++ 3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/bench-session-debian.yaml b/bench-session-debian.yaml index 2430a6f..97d744f 100644 --- a/bench-session-debian.yaml +++ b/bench-session-debian.yaml @@ -6,7 +6,6 @@ metadata:
params: PUB_KEY: None - GATEWAY: 10.0.0.1 ABE_BRANCH: benchmarking BENCHMARK: fakebench TOOLCHAIN: https://releases.linaro.org/14.11/components/toolchain/binaries/arm [...] @@ -37,4 +36,4 @@ install: run: steps: - ./setup_session_debian "$PUB_KEY" - - env BENCH_DEBUG="$BENCH_DEBUG" tmux start-server; set -g status off; n [...] + - env BENCH_DEBUG="$BENCH_DEBUG" tmux start-server; set -g status off; n [...] diff --git a/invoke_session_debian b/invoke_session_debian index 6e5df43..2c05826 100755 --- a/invoke_session_debian +++ b/invoke_session_debian @@ -16,29 +16,22 @@ function exitfunc {
trap exitfunc EXIT
-# Hack for now until lava-test-shell is smart enough to know it's dispatcher ip -gateway=$1 -abe_branch="$2" +abe_branch="$1"
#these parameters used by Benchmark.job -export benchmark="${3:?Must set a benchmark}" -export toolchain="${4:?Must set a toolchain}" -if test x"$5" = xNone; then +export benchmark="${2:?Must set a benchmark}" +export toolchain="${3:?Must set a toolchain}" +if test x"$4" = xNone; then export run_flags= else - export run_flags="$5" + export run_flags="$4" fi -if test x"$6" = xNone; then +if test x"$5" = xNone; then export compiler_flags= else - export compiler_flags="$6" + export compiler_flags="$5" fi
-# Obtain target IP and Hostname -ip_addr=$(ifconfig `ip route get $gateway | cut -d ' ' -f3` | grep 'inet addr' |aw [...] -hostname=$(cat /etc/hostname) -echo "IP address for early debugging: ${ip_addr}" - # Set the PATH to use the LAVA api echo "export PATH=/lava/bin/:$PATH" > ~/.bashrc
@@ -80,6 +73,7 @@ fi #Generate config file for each target in multinode job lava-network broadcast eth0 lava-network collect eth0 +ip_addr="$(lava-network query `lava-group | grep '[[:blank:]]+host$' | awk '{prin [...]
#Request agent just before we need it #This would be two keys in one agent if we wanted one for source, one for job diff --git a/setup_session_debian b/setup_session_debian index 4352d2d..ac6c2b5 100755 --- a/setup_session_debian +++ b/setup_session_debian @@ -12,3 +12,8 @@ echo "Public Key Installed: $1"
/etc/init.d/ssh restart echo "sshd re-started" + +echo "Hostname for early debugging: $(cat /etc/hostname)" +echo "IP address for early debugging: $(hostname -I)" + +