← Back to branch summary

~gz/juju-ci-tools/poke_test_assess_bootstrap

« back to all changes in this revision

Viewing changes to run-client-server-test-remote.bash

Updated to look for Juju in old-juju dir first then in candidate dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
run-client-server-test-remote.bash
10
10
    exit 1
11
11
}
12
12
test $# -ge 3 || usage
 
13
set -x
13
14
candidate_version="$1"
14
15
old_juju_version="$2"
15
16
new_to_old="$3"
16
17
shift 3
17
18
 
18
 
set -x
19
19
# Extract the client and the server.
20
20
mkdir candidate
21
21
mkdir old-juju
22
 
tar zxf $HOME/candidate/osx/juju-$candidate_version-osx.tar.gz -C candidate
 
22
if [[ -f $HOME/old-juju/osx/juju-$candidate_version-osx.tar.gz ]]; then
 
23
    candidate_juju=$HOME/old-juju/osx/juju-$candidate_version-osx.tar.gz
 
24
else
 
25
    candidate_juju=$HOME/candidate/osx/juju-$candidate_version-osx.tar.gz
 
26
fi
 
27
tar zxf $candidate_juju -C candidate
23
28
tar zxf $HOME/old-juju/osx/juju-$old_juju_version-osx.tar.gz -C old-juju
24
29
 
25
30
# Create ssh home.
41
46
echo "Client: " `$client --version`
42
47
 
43
48
mkdir logs
44
 
env=compatibility-control
 
49
env=compatibility-control-osx
45
50
/Users/jenkins/Bin/juju destroy-environment --force -y $env || true
46
51
$SCRIPT/assess_heterogeneous_control.py $server $client \
47
52
  test-reliability-aws $env logs "$@"