← Back to branch summary

~sseman/juju-ci-tools/add-more-maas-nodes

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2016-03-01 21:23:25 UTC
  • mto: This revision was merged to the branch mainline in revision 1305.
  • Revision ID: aaron.bentley@canonical.com-20160301212325-ogp6t6l979xvbxq6
Use revision-build for parallel streams.

Show diffs side-by-side

added added

removed removed

Lines of Context:
run-client-server-test.bash
4
4
export PATH=$HOME/workspace-runner:$PATH
5
5
 
6
6
usage() {
7
 
    echo "usage: $0 old-version candidate-version new-to-old client-os log-dir"
 
7
    echo "usage: $0 old-version candidate-version candidate-revision-build new-to-old client-os log-dir"
8
8
    exit 1
9
9
}
10
 
test $# -eq 5 || usage
 
10
test $# -eq 6 || usage
11
11
old_version="$1"
12
12
candidate_version="$2"
13
 
new_to_old="$3"
14
 
client_os="$4"
15
 
local_log_dir="$5"
 
13
revision_build="$3"
 
14
new_to_old="$4"
 
15
client_os="$5"
 
16
local_log_dir="$6"
16
17
 
17
18
set -x
18
19
 
19
 
if [[ "$new_to_old" == "true"  && -d $HOME/candidate/$candidate_version ]]; then
20
 
    echo "Using weekly streams for unreleased version"
21
 
    agent_arg="--agent-url http://juju-dist.s3.amazonaws.com/weekly/tools"
 
20
parallel_url="http://juju-dist.s3.amazonaws.com/parallel-testing/agents"
 
21
if [[ "$new_to_old" == "true" ]]; then
 
22
    echo "Using parallel streams for candidate."
 
23
    agent_arg="--agent-stream revision-build-$revision_build"
 
24
    agent_arg="$agent_arg --agent-url $parallel_url"
22
25
else
23
26
    echo "Using official proposed (or released) streams"
24
27
    agent_arg="--agent-stream proposed"