← Back to branch summary

~fginther/auto-package-testing/release-from-command-line

« back to all changes in this revision

Viewing changes to bin/prepare-testbed

  • Committer: Jean-Baptiste Lallement
  • Date: 2012-10-25 09:25:01 UTC
  • Revision ID: jean-baptiste.lallement@ubuntu.com-20121025092501-5kfmlej7j6kup9qf
Project structure clean-up

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/prepare-testbed
30
30
# Find out our current directory
31
31
BINDIR=$(dirname $(readlink -f $0))
32
32
. $BINDIR/functions
33
 
. $BINDIR/config
 
33
. $BINDIR/../etc/config
34
34
 
35
35
# Overrides global configuration
36
36
[ -f ~/.adtrc ] && . ~/.adtrc
245
245
RET=1
246
246
log_info_msg "Waiting for installation to finish"
247
247
until [ $RET -eq 0 ]; do
248
 
    scp $SSHOPTS -P $SSHPORT -i $KEYPATH $BINDIR/wait_bootfinished ubuntu@localhost:~/
 
248
    scp $SSHOPTS -P $SSHPORT -i $KEYPATH $BINDIR/testbed/wait_bootfinished ubuntu@localhost:~/
249
249
    RET=$?
250
250
    if [ $LOOP -gt 12 ]; then
251
251
        log_failure_msg "Failed to reach the VM after 120s. Exiting."