run_remote_test.sh: explicitly start/stop ssh-agent

run_remote_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to run client or server tests on a live remote image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 11 matching lines @@
 DEFINE_string chroot "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c
 DEFINE_boolean cleanup ${FLAGS_FALSE} "Clean up temp directory"
 DEFINE_integer iterations 1 "Iterations to run every top level test" i
 DEFINE_string results_dir_root "" "alternate root results directory"
 DEFINE_boolean verbose ${FLAGS_FALSE} "Show verbose autoserv output" v
 DEFINE_boolean use_emerged ${FLAGS_FALSE} \
     "Force use of emerged autotest packages"
 
 RAN_ANY_TESTS=${FLAGS_FALSE}
 
+function stop_ssh_agent() {

[kmixter1, 2011/01/13 23:16:39]

Agree it would be good to say that this is implicitly required to be set up by
autotest.

+  # Call this function from the exit trap of the main script.
+  # Iff we started ssh-agent, be nice and clean it up.
+  # Note, only works if called from the main script - no subshells.
+  if [[ 1 -eq ${OWN_SSH_AGENT} ]]
+  then
+    kill ${SSH_AGENT_PID} 2>/dev/null
+    unset SSH_AGENT_PID SSH_AUTH_SOCK
+  fi
+}
+
+function start_ssh_agent() {
+  local tmp_private_key=$TMP/autotest_key
+  if [ -z "$SSH_AGENT_PID" ]; then
+    eval $(ssh-agent)
+    OWN_SSH_AGENT=1
+  else
+    OWN_SSH_AGENT=0
+  fi
+  cp $FLAGS_private_key $tmp_private_key
+  chmod 0400 $tmp_private_key
+  ssh-add $tmp_private_key
+}
+
 function cleanup() {
   # Always remove the build path in case it was used.
   [[ -n "${BUILD_DIR}" ]] && sudo rm -rf "${BUILD_DIR}"
   if [[ $FLAGS_cleanup -eq ${FLAGS_TRUE} ]] || \
      [[ ${RAN_ANY_TESTS} -eq ${FLAGS_FALSE} ]]; then
     rm -rf "${TMP}"
   else
     echo ">>> Details stored under ${TMP}"
   fi
+  stop_ssh_agent
   cleanup_remote_access
 }
 
 # Determine if a control is for a client or server test.  Echos
 # either "server" or "client".
 # Arguments:
 #   $1 - control file path
 function read_test_type() {
   local control_file=$1
   # Assume a line starts with TEST_TYPE =
@@ skipping 110 matching lines @@
       exit 1
     fi
   fi
 
   set -e
 
   create_tmp
 
   trap cleanup EXIT
 
   remote_access_init

[petkov, 2011/01/13 23:22:27]

btw, are you setting up 2 ssh-agent's now? any conflicts with init/cleanup?

+  start_ssh_agent
 
   learn_board
   autodetect_build
 
   local control_files_to_run=""
   local chrome_autotests="${CHROME_ROOT}/src/chrome/test/chromeos/autotest/files"
   # Now search for tests which unambiguously include the given identifier
   local search_path=$(echo {client,server}/{tests,site_tests})
   # Include chrome autotest in the search path
   if [ -n "${CHROME_ROOT}" ]; then
@@ skipping 104 matching lines @@
 
   echo ""
   info "Test results:"
   ./generate_test_report "${TMP}" --strip="${TMP}/"
 
   print_time_elapsed
 }
 
 restart_in_chroot_if_needed "$@"
 main "$@"