← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to run-reliability-test.bash

  • Committer: Curtis Hovey
  • Date: 2015-06-11 19:35:22 UTC
  • mto: This revision was merged to the branch mainline in revision 983.
  • Revision ID: curtis@canonical.com-20150611193522-o2nqkqb04o2i75wv
Remove euca_dump_logs because it has not been used this year.

Show diffs side-by-side

added added

removed removed

Lines of Context:
run-reliability-test.bash
1
1
#!/bin/bash
2
2
set -eu
3
3
: ${SCRIPTS=$(readlink -f $(dirname $0))}
 
4
new_juju=$(find $new_juju_dir -name juju)
4
5
old_stable_juju=$(find $old_stable_juju_dir -name juju)
5
6
 
6
7
export JUJU_HOME=$HOME/cloud-city
7
8
build_id=${JOB_NAME}-${BUILD_NUMBER}
8
9
s3cfg=$JUJU_HOME/juju-qa.s3cfg
9
10
s3base=s3://juju-qa-data/industrial-test/${build_id}
10
 
if [ "${new_agent_url-}" != "" ]; then
 
11
if [ "$new_agent_url" != "" ]; then
11
12
  extra_args="--new-agent-url $new_agent_url"
12
13
else
13
14
  extra_args=""
14
15
fi
15
16
set -x
16
17
# Delete all files in $WORKSPACE, but no error if empty.
17
 
find $WORKSPACE -mindepth 1 -delete
18
 
if [ "${revision_build-}" != "" ]; then
19
 
  extra_args="$extra_args --agent-stream revision-build-$revision_build"
20
 
  new_juju=$($SCRIPTS/s3ci.py get-juju-bin $revision_build $WORKSPACE)
21
 
  $SCRIPTS/s3ci.py get $revision_build build-revision buildvars.json $WORKSPACE
22
 
  buildvars=$WORKSPACE/buildvars.json
23
 
else
24
 
  new_juju=$(find $new_juju_dir -name juju)
25
 
  buildvars=$new_juju_dir/buildvars.json
26
 
fi
27
 
if [ "${both_new-}" == "true" ]; then
28
 
  export PATH=$(dirname $new_juju):$PATH
29
 
fi
30
 
logs=$WORKSPACE/logs
31
 
mkdir $logs
32
 
$SCRIPTS/write_industrial_test_metadata.py $buildvars $environment \
33
 
  metadata.json
 
18
find $WORKSPACE -type f -delete
 
19
$SCRIPTS/write_industrial_test_metadata.py $new_juju_dir/buildvars.json \
 
20
  $environment metadata.json
34
21
s3cmd -c $s3cfg put metadata.json $s3base-metadata.json
35
 
timeout -sINT -k 10m 2d $SCRIPTS/industrial_test.py $environment $new_juju \
36
 
  --old-stable $old_stable_juju $suite $logs --attempts $attempts \
 
22
timeout -sINT -k 10m 1d $SCRIPTS/industrial_test.py $environment $new_juju \
 
23
  --old-stable $old_stable_juju $suite --attempts $attempts \
37
24
  --json-file results.json $extra_args
38
25
s3cmd -c $s3cfg put results.json $s3base-results.json