Bug 795392: ssh script cleanup script should delete acceptance-tests.* from previous build (r=brbaker)
authorDan Schaffer <Dan.Schaffer@adobe.com>
Fri, 28 Sep 2012 11:03:50 -0700
changeset 7556 b42acf5bc26a2b2530d33985992481ff2d4ce498
parent 7555 a101c88364b8012463872f73334cb0d4dc2cecfe
child 7557 58be71b37b16e0c96567453930a51fdc08bc2d11
push id4260
push userdschaffe@adobe.com
push dateFri, 05 Oct 2012 17:33:23 +0000
reviewersbrbaker
bugs795392, 1118964
Bug 795392: ssh script cleanup script should delete acceptance-tests.* from previous build (r=brbaker) without this cleanup the sandbox will use acceptance tests from the previous sandbox build if the changelist is the same even if the shelved changelist is different. CL@1118964
build/buildbot/slaves/all/util-acceptance-clean-ssh.sh
--- a/build/buildbot/slaves/all/util-acceptance-clean-ssh.sh
+++ b/build/buildbot/slaves/all/util-acceptance-clean-ssh.sh
@@ -54,21 +54,25 @@ do
     echo "SSH_SHELL_REMOTE_USER" = "$SSH_SHELL_REMOTE_USER"
     echo "SSH_SHELL_REMOTE_HOST" = "$SSH_SHELL_REMOTE_HOST"
     echo "SSH_SHELL_REMOTE_BASEDIR" = "$SSH_SHELL_REMOTE_BASEDIR"
     echo "SSH_SHELL_REMOTE_DIR" = "$SSH_SHELL_REMOTE_DIR"
 
     #
     # remove old abc and shells from the device
     #
-    echo "cleanup up $SSH_SHELL_REMOTE_DIR directory on remote machine..."
+    echo "cleanup $SSH_SHELL_REMOTE_DIR directory on remote machine..."
     ssh $SSH_SHELL_REMOTE_USER@$SSH_SHELL_REMOTE_HOST "cd $SSH_SHELL_REMOTE_DIR; rm -r ./*"
 
-    echo "cleanup up $SSH_SHELL_REMOTE_BASEDIR/builds directory on remote machine..."
+    echo "cleanup $SSH_SHELL_REMOTE_BASEDIR/builds directory on remote machine..."
     ssh $SSH_SHELL_REMOTE_USER@$SSH_SHELL_REMOTE_HOST "cd $SSH_SHELL_REMOTE_BASEDIR/builds; rm -r ./*"
+
+    echo "cleanup $SSH_SHELL_REMOTE_BASEDIR/acceptance-test-abcs.* on remote machine..."
+    ssh $SSH_SHELL_REMOTE_USER@$SSH_SHELL_REMOTE_HOST "cd $SSH_SHELL_REMOTE_BASEDIR; rm -f acceptance-tests-abcs.*" 
+
     echo "========================================="
     echo ""
 
     count=$[count+1]
     test "$count" == "$threadcount" && {
         break
     }