Merge lp:~juju-qa/charms/trusty/juju-reports/perfscale_add_collection_to_cron_template into lp:~juju-qa/charms/trusty/juju-reports/trunk

[Christopher Lee]

Update crontab template to include data collection for perfscale data for reporting.

Depends on this branch landing first: https://code.launchpad.net/~veebers/juju-reports/adding_perfscale_datasync/+merge/308876

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

[lp:~juju-qa/charms/trusty/juju-reports/perfscale_add_collection_to_cron_template]

81. By Christopher Lee on 2017-02-08

Merge trunk and resolve conflict.

=== modified file 'templates/crontab.tmpl'
--- templates/crontab.tmpl	2017-01-30 22:31:44 +0000
+++ templates/crontab.tmpl	2017-02-08 20:07:35 +0000
@@ -9,6 +9,9 @@
 # Every few minutes collect CI test results.
 */$interval * * * * ubuntu flock -n $lockdir/get_s3_ci_results.lock get-s3-ci-results --email-logs --log-file $logs/get-s3-ci-results.log
 
+# Every few minutes collect perfscale test results.
+*/$interval * * * * ubuntu flock -n $lockdir/get_s3_perfscale_results.lock get-s3-perfscale-results --email-logs --log-file $logs/get-s3-perfscale-results.log
+
 # Every few minutes check for undescribed non-voting tests.
 */$interval * * * * ubuntu flock -n $lockdir/non-voting.lock non-voting --email-logs --log-file $logs/non-voting.log