Permalink
Browse files

ts: more updates

  • Loading branch information...
1 parent d323c9e commit 6ad1fb723dfbe953a415f5451719718d52dcf3e3 @gregkh committed Sep 25, 2012
Showing with 8 additions and 5 deletions.
  1. +8 −5 test/ts
View
@@ -29,7 +29,10 @@ EMAIL="greg@kroah.com"
REMOTE_STABLE_GIT="/home/ec2-user/linux/stable/linux-stable/"
REMOTE_WORK="/home/ec2-user/tmp/"
-REMOTE_SERVER="ec2-50-112-17-159.us-west-2.compute.amazonaws.com"
+#REMOTE_SERVER="ec2-50-112-17-159.us-west-2.compute.amazonaws.com" # not mine
+REMOTE_SERVER="ec2-54-245-1-104.us-west-2.compute.amazonaws.com" # mine
+SSH_OPTIONS="-i /home/gregkh/.ssh/stable_build.pem"
+
REMOTE_USER="ec2-user"
LOCAL_WORK="/tmp/"
@@ -56,7 +59,7 @@ SCRIPT_HOME=`mktemp -d ${LOCAL_WORK}/stable_test_XXXXX`
echo "Using ${SCRIPT_HOME} for our local files"
# create the remote directory
-REMOTE_DIR=`ssh ${REMOTE_USER}@${REMOTE_SERVER} mktemp -d ${REMOTE_WORK}/stable_test_XXXXX`
+REMOTE_DIR=`ssh ${SSH_OPTIONS} ${REMOTE_USER}@${REMOTE_SERVER} mktemp -d ${REMOTE_WORK}/stable_test_XXXXX`
echo "Using ${REMOTE_DIR} for the remote directory"
@@ -97,7 +100,7 @@ cd ..
QUILT_PATCHES=patches QUILT_SERIES=patches/series quilt push -aq --quiltrc
# build stuff
-perl ../ktest.pl ../ktest.conf
+time perl ../ktest.pl ../ktest.conf
KTEST_RUN=$?
echo "KTEST_RUN = \${KTEST_RUN}"
@@ -140,7 +143,7 @@ __EOF__
cp ${LOCAL_KTEST} ${SCRIPT_HOME}
# copy the files we created to the remote machine
-scp -q ${SCRIPT_HOME}/* ${REMOTE_USER}@${REMOTE_SERVER}:${REMOTE_DIR}
+scp ${SSH_OPTIONS} -q ${SCRIPT_HOME}/* ${REMOTE_USER}@${REMOTE_SERVER}:${REMOTE_DIR}
# remove the local files as we don't need them anymore
rm -rf ${SCRIPT_HOME}
@@ -151,7 +154,7 @@ rm -rf ${SCRIPT_HOME}
#ssh ${REMOTE_USER}@${REMOTE_SERVER} "cd ${REMOTE_DIR} && nohup \"${REMOTE_DIR}/run_test.sh & > ${REMOTE_DIR}/output_log\""
#ssh ${REMOTE_USER}@${REMOTE_SERVER} "nohup ${REMOTE_DIR}/run_test.sh > ${REMOTE_DIR}/output_log &"
#ssh ${REMOTE_USER}@${REMOTE_SERVER} "${REMOTE_DIR}/run_test.sh > ${REMOTE_DIR}/output_log"
-ssh -n -f ${REMOTE_USER}@${REMOTE_SERVER} "sh -c \"cd ${REMOTE_DIR}; nohup ./run_test.sh > ${REMOTE_DIR}/output_log 2>&1 &\" "
+ssh ${SSH_OPTIONS} -n -f ${REMOTE_USER}@${REMOTE_SERVER} "sh -c \"cd ${REMOTE_DIR}; nohup ./run_test.sh > ${REMOTE_DIR}/output_log 2>&1 &\" "
exit

0 comments on commit 6ad1fb7

Please sign in to comment.