This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a commit to branch inserted_src in repository toolchain/semiautobench.
commit d0c4ab6bc593d42c183ae1b453b377965b448fc3 Author: Bernard Ogden bernie.ogden@linaro.org Date: Fri Jul 24 15:44:53 2015 +0200
Remove hacking session isms
Change-Id: I753801fcc4c051401d0aabb218bb7fd02d33324f --- bench-session-debian.yaml | 3 +-- invoke_session_debian | 33 +++++++-------------------------- 2 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/bench-session-debian.yaml b/bench-session-debian.yaml index fcd9dd4..f55a22a 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 [...] @@ -36,4 +35,4 @@ install: run: steps: - ./setup_session_debian "$PUB_KEY" - - ./invoke_session_debian "$GATEWAY" "$ABE_BRANCH" "$BENCHMARK" "$TOOLCHAI [...] + - ./invoke_session_debian "$ABE_BRANCH" "$BENCHMARK" "$TOOLCHAIN" "$RUN_FL [...] diff --git a/invoke_session_debian b/invoke_session_debian index fe835e0..aa92c74 100755 --- a/invoke_session_debian +++ b/invoke_session_debian @@ -1,5 +1,4 @@ #!/bin/bash -# Usage ./invoke_session <gateway> set -u set -o pipefail
@@ -7,35 +6,22 @@ error=1
trap "rm -rf ~/*; exit ${error}" 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" -export toolchain="$4" -if test x"$5" = xNone; then +export benchmark="$2" +export toolchain="$3" +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" -fi -echo "Target's Gateway: $gateway" - -if ! grep 'invoke_session' /etc/rc.local -then - sed -i '/bin/a invoke_session &' /etc/rc.local + 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_addr} - # Set the PATH to use the LAVA api echo "export PATH=/lava/bin/:$PATH" > ~/.bashrc
@@ -74,11 +60,6 @@ if ! ssh -o NoHostAuthenticationForLocalhost=yes localhost true; then exit 1 fi
-echo "" -mkdir -p /run -mkdir -p /run/hacking -echo $$ > /run/hacking/hacking.pid - #Generate config file for each target in multinode job lava-network broadcast eth0 lava-network collect eth0