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

Proposed by Martin Packman
Status: Merged
Merged at revision: 50
Proposed branch: lp:~gz/charms/precise/juju-reports/rm_cron_storedata
Merge into: lp:~juju-qa/charms/precise/juju-reports/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
templates/crontab.tmpl (+1/-1)
To merge this branch: bzr merge lp:~gz/charms/precise/juju-reports/rm_cron_storedata
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+247024@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Aaron Bentley (abentley) wrote :

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

review: Approve
Aaron Bentley (abentley) wrote :

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

review: Needs Fixing
50. By Martin Packman on 2015-01-20

Remove store-trigger after cbtest from crontab template

Martin Packman (gz) wrote :

Changed to just remove the store-trigger part.

Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/crontab.tmpl'
2--- templates/crontab.tmpl 2014-11-10 16:04:33 +0000
3+++ templates/crontab.tmpl 2015-01-20 15:23:15 +0000
4@@ -3,7 +3,7 @@
5 $error_email
6 INI=$reports_home/production.ini
7
8-* * * * * ubuntu cbtest --email-logs --log-file $logs/cbtest.log && store-trigger --email-logs --log-file $logs/store-trigger.log
9+* * * * * ubuntu cbtest --email-logs --log-file $logs/cbtest.log
10 */$interval * * * * ubuntu $reports_home/bin/python $reports_home/jujureports/jobs/jujuci.py
11 */$interval * * * * ubuntu get-s3-ci-results --email-logs --log-file $logs/get-s3-ci-results.log
12 # */$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/charm_testing.py

Subscribers

People subscribed via source and target branches

to all changes: