Merge lp:~adeuring/charms/precise/juju-reports/config-cloud-health-script into lp:~juju-qa/charms/precise/juju-reports/trunk

[Abel Deuring]

Updates for the script "cloud-heath":

  - New entry in the crontab template
  - new config parameter "cloud-health-failure-threshold"

I am not 100% sure what the best time to start the script is: The cloud health builds are started at *:45 and run typically less than 5 minutes; azure tests need typically up to 10 or 12 minutes.

Builds from most jobs can occasionally run for more than 20 minutes, meaning that the most build (that will likely be a failure) will not be noticed for another hour. OTOH, waiting longer just for the rare longer running jobs does not make much sense either.

Another option would be to start the script three or four times per hour, for example, at minutes 15, 35, 55.

[lp:~adeuring/charms/precise/juju-reports/config-cloud-health-script]

48. By Abel Deuring on 2014-11-10

nonsensical crontab spec fixed.

[Aaron Bentley (abentley)]

Thanks for testing. Looks good to me.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-08-20 17:02:22 +0000
+++ config.yaml	2014-11-10 16:07:45 +0000
@@ -56,3 +56,9 @@
     type: string
     default: ""
     description: "The build token for the charm-bundle-test job."
+  cloud-health-failure-threshold:
+    type: string
+    default: ""
+    description: |
+      The failure thresholds for cloud health jobs.
+      A space-separated list of job-name:failure-threshold pairs.
 
=== modified file 'hooks/common.py'
--- hooks/common.py	2014-11-03 15:30:04 +0000
+++ hooks/common.py	2014-11-10 16:07:45 +0000
@@ -35,7 +35,7 @@
 
 
 def install_ini(mongo_url, gh_token, jujuci_url, token, error_email,
-                error_email_from):
+                error_email_from, cloud_health_failure_threshold):
     config = ConfigParser()
     path = get_template_path(INI)
     if not os.path.exists(path):
@@ -48,6 +48,9 @@
     config.set('app:main', 'home', HOME)
     config.set('app:main', 'error_email', error_email)
     config.set('app:main', 'error_email_from', error_email_from)
+    config.set(
+        'app:main', 'cloud_health_failure_threshold',
+        cloud_health_failure_threshold)
     config.write(open(get_ini_path(), 'w'))
     return config
 
@@ -276,7 +279,8 @@
         return
     ini = install_ini(mongo_url, config['gh-token'], config['jujuci-url'],
                       config['charm-bundle-test-token'],
-                      config['error-email'], config['error-email-from'])
+                      config['error-email'], config['error-email-from'],
+                      config['cloud-health-failure-threshold'])
     configure_s3(config)
     unset = [key for key in [
         'lp-key', 'lp-oauth', 'gh-token', 'charm-bundle-test-token',
 
=== modified file 'templates/crontab.tmpl'
--- templates/crontab.tmpl	2014-08-25 14:31:49 +0000
+++ templates/crontab.tmpl	2014-11-10 16:07:45 +0000
@@ -11,3 +11,4 @@
 # in the file production.ini in lp:juju-reports.
 0 16 * * * ubuntu update-bugs --email-logs --log-file=$logs/update-bugs.log && scorecard --email-logs --log-file=$logs/scorecard.log
 #0 0 * * 1 ubuntu INI=production.ini $reports_home/bin/python $reports_home/jujureports/jobs/cabs.py
+5 * * * * ubuntu cloud-health --email-logs --log-file=$logs/cloud-health.log