This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a commit to branch bernie/benchmarking-agents in repository toolchain/abe.
commit 71f8a33d55eb99019fc60095c26e5bec75c83fa1 Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu Jul 30 16:55:23 2015 +0200
Rely on a single agent
Now that we use a onetime key in default location, we do not have to put that key in an agent. This makes it fairly simple to let abe handle all git interactions, as we don't need to clone with one key and interact with targets with another.
Change-Id: I60fc074df683d634f1e19c670a50ccaedaa877c8 --- config/bench/lava/host-session | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/config/bench/lava/host-session b/config/bench/lava/host-session index f4edc8c..30f2091 100755 --- a/config/bench/lava/host-session +++ b/config/bench/lava/host-session @@ -59,19 +59,11 @@ chmod 755 /usr/local/bin/git-new-workdir if ! ssh-keygen -P '' -f ~/.ssh/id_rsa > /dev/null < /dev/null; then exit 1 fi -eval `ssh-agent` -ssh-add ~/.ssh/id_rsa
#Create directory for communication with other hosts mkdir ~/data || exit 1
-#Need to be able to ssh to self to get local sources -#Can reuse the onetime key for this -cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys -echo -n 'localhost ' >> ~/.ssh/known_hosts -cat /etc/ssh/ssh_host_ecdsa_key.pub >> ~/.ssh/known_hosts - -#Also need to be able to ssh to dev-private +#Need to be able to ssh to dev-private echo 'dev-private.git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyN [...]
#Generate config file for each target in multinode job @@ -82,14 +74,11 @@ ip_addr="$(lava-network query `lava-group | grep '[[:blank:]]+ [...] #Request agent just before we need it #This would be two keys in one agent if we wanted one for source, one for job echo "*** WAITING FOR AGENT: ${ip_addr}" -echo "ssh -o ControlMaster=no -o ControlPath=/dev/null -A ${ip_addr}.lab 'ln -sf \ [...] +echo "ssh -o ControlMaster=no -o ControlPath=/dev/null -A ${ip_addr}.lab 'ln -sf \ [...] while ! test -e ~/data/socket; do inotifywait -e create ~/data done -#Best practice would be to use abe to do this, but I hope this is temporary -SSH_AUTH_SOCK=~/data/socket git clone "`grep ${benchmark} ${ABE_DIR}/config/source [...] -#An alternative to the following would be to pass ${benchmark}=ssh://... to abe.sh -sed -i "s#^\(${benchmark}\.git[[:blank:]]\+\).*#\1ssh://localhost/~/benchsrc/ [...] +export SSH_AUTH_SOCK=~/data/socket
target_names=() for lava_name in `lava-group | grep -v '[[:blank:]]*host$' | awk '{print $1}'`; do @@ -99,7 +88,7 @@ for lava_name in `lava-group | grep -v '[[:blank:]]*host$' | awk [...]
#Check that target is accessible, add it to our known_hosts, #add our one-time key to its authorized_keys - if ! cat ~/.ssh/id_rsa.pub | SSH_AUTH_SOCK=~/data/socket ssh -o StrictHostKeyChe [...] + if ! cat ~/.ssh/id_rsa.pub | ssh -o StrictHostKeyChecking=no "${target_ip}" "cat [...] echo "Could not access target ${target_ip} (${lava_name})" >&2 exit 1 fi @@ -121,9 +110,6 @@ for lava_name in `lava-group | grep -v '[[:blank:]]*host$' | aw [...] fi done
-#Don't need the agent any more, kill the socket -rm ~/data/socket - export targets="${target_names[@]}"
echo "Running benchmark... I may be some time"