~landscape/ci/cistack-slaves

« back to all changes in this revision

Viewing changes to jenkins/charm-integration-test

  • Committer: David Britton
  • Date: 2015-06-11 19:26:36 UTC
  • Revision ID: dpb@canonical.com-20150611192636-6mkqiqvhi19clj5i
print message before attempting log collection

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
 
24
24
need_var_set "JUJU_HOME"
25
25
need_var_set "JUJU_ENV"
26
 
need_file "$JUJU_HOME/environments.yaml"
27
26
 
28
27
echo "JUJU_HOME: $JUJU_HOME"
29
28
echo "JUJU_ENV: $JUJU_ENV"
40
39
trap "destroy_environment" EXIT
41
40
make test integration-test || rc=$?
42
41
if [ "$rc" -ne "0" ]; then
43
 
    echo "Error! -- Collecting Logs/Status"
 
42
    echo "Tests Errored! -- Attempging to cleanup and Collecting Logs/Status"
44
43
    juju status > juju-status.txt || /bin/true
45
44
    timeout 30s juju debug-log -n 2000 > juju-debug-log.txt || /bin/true
46
45
    timeout 5m $DIR/../gojuju/collect-logs ./logs.tgz