← Back to branch summary

~gz/juju-ci-tools/poke_test_assess_bootstrap

« back to all changes in this revision

Viewing changes to run-win-client-server-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-win-client-server-remote.bash
7
7
new_to_old="$3"
8
8
shift 3
9
9
 
 
10
if [ -f $HOME/old-juju/win/juju-$candidate_version-win.zip ]; then
 
11
    /cygdrive/c/progra~2/7-Zip/7z.exe e -y -ocandidate C:\\users\\Administrator\\old-juju\\win\\juju-$candidate_version-win.zip
 
12
   candidate_juju=candidate\\juju.exe
 
13
else
 
14
   /cygdrive/c/progra~2/innoextract/innoextract.exe -e C:\\users\\Administrator\\candidate\\win\\juju-setup-$candidate_version.exe -d candidate
 
15
   candidate_juju=candidate\\app\\juju.exe
 
16
fi
10
17
/cygdrive/c/progra~2/7-Zip/7z.exe e -y -oold-juju C:\\users\\Administrator\\old-juju\\win\\juju-$old_juju_version-win.zip
11
 
/cygdrive/c/progra~2/innoextract/innoextract.exe -e C:\\users\\Administrator\\candidate\\win\\juju-setup-$candidate_version.exe -d candidate
12
18
 
13
19
if [ "$new_to_old" = "true" ]; then
14
 
  echo "Server:" `candidate/app/juju.exe --version`
15
 
  echo "Client:" `old-juju/juju.exe --version`
16
 
  server=candidate\\app\\juju.exe
 
20
  server=$candidate_juju
17
21
  client=old-juju\\juju.exe
18
22
else
19
 
  echo "Server:" `old-juju/juju.exe --version`
20
 
  echo "Client:" `candidate/app/juju.exe --version`
21
 
  client=candidate\\app\\juju.exe
 
23
  client=$candidate_juju
22
24
  server=old-juju\\juju.exe
23
25
fi
24
26
 
 
27
echo "Server:" `$server --version`
 
28
echo "Client:" `$client --version`
 
29
 
25
30
mkdir logs
26
 
juju destroy-environment --force -y compatibility-control || true
 
31
juju destroy-environment --force -y compatibility-control-win || true
27
32
python C:\\users\\Administrator\\juju-ci-tools\\assess_heterogeneous_control.py \
28
 
  $server $client test-win-client-server compatibility-control logs "$@"
 
 
b'\\ No newline at end of file'
 
33
  $server $client test-win-client-server compatibility-control-win logs "$@"
 
 
b'\\ No newline at end of file'