Merge lp:~gz/charms/precise/juju-reports/rm_cron_storedata into lp:~juju-qa/charms/precise/juju-reports/trunk

[Martin Packman]

Removes the store-data script from the crontab template

Aaron says we've already warned that we would stop auto-testing charms so we can disable this script.

[Aaron Bentley (abentley)]

Please test manually. Otherwise, this looks good to land.

review: Approve

[Aaron Bentley (abentley)]

Oops, just noticed that this disables the cbtest script too. Only the store-trigger may be disabled.

review: Needs Fixing

[lp:~gz/charms/precise/juju-reports/rm_cron_storedata]

50. By Martin Packman on 2015-01-20

Remove store-trigger after cbtest from crontab template

[Martin Packman (gz)]

Changed to just remove the store-trigger part.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'templates/crontab.tmpl'
--- templates/crontab.tmpl	2014-11-10 16:04:33 +0000
+++ templates/crontab.tmpl	2015-01-20 15:23:15 +0000
@@ -3,7 +3,7 @@
 $error_email
 INI=$reports_home/production.ini
 
-* * * * * ubuntu cbtest --email-logs --log-file $logs/cbtest.log && store-trigger --email-logs --log-file $logs/store-trigger.log
+* * * * * ubuntu cbtest --email-logs --log-file $logs/cbtest.log
 */$interval * * * * ubuntu $reports_home/bin/python $reports_home/jujureports/jobs/jujuci.py
 */$interval * * * * ubuntu get-s3-ci-results --email-logs --log-file $logs/get-s3-ci-results.log
 # */$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/charm_testing.py