Merge lp:~abentley/charms/precise/juju-reports/cron-store-trigger into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Add store-trigger & cbtest to cron, update template handling.

Add store-trigger and cbtest to cron.

cbtest is run before store-trigger because store-trigger needs to know about all tests that were run.

The charm is updated to delete the template if the required variables are mising, so that stale templates are not left behind.

The check for unset variables now lists all unset variables at once.

Fixed the mailto handling. It was broken because error-email will be the empty string, not None, if unset.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-08-08 18:55:10 +0000
+++ hooks/common.py	2014-08-14 16:56:21 +0000
@@ -170,15 +170,28 @@
     subprocess.check_call(['apt-get', 'autoremove', '--yes'])
 
 
+def update_cronjob(contents=None):
+    path = '/etc/cron.d/ubuntu'
+    if contents is None:
+        try:
+            os.unlink(path)
+        except OSError as e:
+            if e.errno != errno.ENOENT:
+                raise
+    else:
+        with open('/etc/cron.d/ubuntu', 'w') as outfile:
+            outfile.write(contents)
+
+
 def install_cronjob(interval, error_email):
     t = Template(file='templates/crontab.tmpl')
     t.interval = interval
-    if error_email is not None:
+    if error_email != '':
         t.error_email = 'MAILTO=%s' % error_email
     else:
         t.error_email = ''
     t.reports_home = PROJECT_DIR
-    open('/etc/cron.d/ubuntu', 'w').write(str(t))
+    update_cronjob(str(t))
 
 
 def ini_get(ini, section, key):
@@ -261,10 +274,12 @@
     ini = install_ini(mongo_url, config['gh-token'], config['jujuci-url'],
                       config['charm-bundle-test-token'])
     configure_s3(config)
-    for key in ['lp-key', 'lp-oauth', 'gh-token']:
-        if config[key] == '':
-            hookenv.log('Not setting up cron because {} not set.'.format(key))
-            break
+    unset = [key for key in ['lp-key', 'lp-oauth', 'gh-token',
+             'charm-bundle-test-token'] if config[key] == '']
+    if len(unset) > 0:
+        hookenv.log('Not setting up cron because {} not set.'.format(
+            ', '.join(unset)))
+        update_cronjob(None)
     else:
         install_cronjob(config['cron-interval'], config['error-email'])
     start()
 
=== modified file 'templates/crontab.tmpl'
--- templates/crontab.tmpl	2014-05-29 18:58:13 +0000
+++ templates/crontab.tmpl	2014-08-14 16:56:21 +0000
@@ -2,8 +2,9 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 $error_email
 
+* * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/cbtest > /dev/null && INI=$reports_home/production.ini $reports_home/bin/store-trigger > /dev/null 2> /dev/null
 */$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/jujuci.py
-*/$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/charm_testing.py
+# */$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/charm_testing.py
 # The weekday below should match the value scorecard.collection_day
 # in the file production.ini in lp:juju-reports.
 0 16 * * 0 ubuntu INI=$reports_home/production.ini $reports_home/bin/update-stats $reports_home/bugs.json $reports_home/jujureports/lp_credentials.txt