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

[Martin Packman]

Adds new config value for the location of the S3 mirror.

Maybe quibble over whether we want all the path like this, or just the scheme and domain?

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

49. By Martin Packman on 2015-01-12

Add cidata-url config setting for referencing build artifacts

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-11-10 14:31:29 +0000
+++ config.yaml	2015-01-12 19:12:10 +0000
@@ -44,6 +44,10 @@
     type: string
     default: http://juju-ci.vapour.ws:8080
     description: "The Jenkins URL to use for retrieving Juju CI data."
+  cidata-url:
+    type: string
+    default: http://data.vapour.ws/juju-ci/products
+    description: "The S3 mirror URL to use for linking build artifacts."
   aws-access-key:
     type: string
     default: ""

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-11-21 16:47:22 +0000
+++ hooks/common.py	2015-01-12 19:12:10 +0000
@@ -35,8 +35,9 @@
     return os.path.join(source_path, 'resources/{}.template'.format(name))
 
 
-def install_ini(mongo_url, gh_token, jujuci_url, token, error_email,
-                error_email_from, cloud_health_failure_threshold, source_path):
+def install_ini(mongo_url, gh_token, jujuci_url, cidata_url, token,
+                error_email, error_email_from, cloud_health_failure_threshold,
+                source_path):
     config = ConfigParser()
     path = get_template_path(INI, source_path)
     if not os.path.exists(path):
@@ -45,6 +46,7 @@
     config.set('app:main', 'mongo.url', mongo_url)
     config.set('app:main', 'gh_token', gh_token)
     config.set('app:main', 'jujuci.url', jujuci_url)
+    config.set('app:main', 'cidata.url', cidata_url)
     config.set('app:main', 'charm_bundle_test_token', token)
     config.set('app:main', 'home', HOME)
     config.set('app:main', 'error_email', error_email)
@@ -337,7 +339,7 @@
             make_project_link(source_path, config['source'], config['revno'])
         return
     ini = install_ini(mongo_url, config['gh-token'], config['jujuci-url'],
-                      config['charm-bundle-test-token'],
+                      config['cidata-url'], config['charm-bundle-test-token'],
                       config['error-email'], config['error-email-from'],
                       config['cloud-health-failure-threshold'], source_path)
     configure_s3(config, source_path)