Merge lp:~abentley/charms/precise/juju-reports/charm-bundle-test-token into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Add charm-bundle-test-token config option.

This branch implements a charm-bundle-test-token config value, so that the juju-reports machine can trigger builds of charm-bundle-test.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2014-07-18 20:19:59 +0000
+++ config.yaml	2014-08-11 16:43:59 +0000
@@ -48,3 +48,7 @@
     type: string
     default: ""
     description: "The secret key to use for the s3 bucket."
+  charm-bundle-test-token:
+    type: string
+    default: ""
+    description: "The build token for the charm-bundle-test job."

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-07-22 16:35:33 +0000
+++ hooks/common.py	2014-08-11 16:43:59 +0000
@@ -34,7 +34,7 @@
     return os.path.join(PROJECT_DIR, 'resources/{}.template'.format(name))
 
 
-def install_ini(mongo_url, gh_token, jujuci_url):
+def install_ini(mongo_url, gh_token, jujuci_url, token):
     config = ConfigParser()
     path = get_template_path(INI)
     if not os.path.exists(path):
@@ -43,6 +43,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', 'charm_bundle_test_token', token)
     config.set('app:main', 'home', HOME)
     config.write(open(get_ini_path(), 'w'))
     return config
@@ -257,7 +258,8 @@
     if mongo_url == '':
         hookenv.log('No mongodb set up.')
         return
-    ini = install_ini(mongo_url, config['gh-token'], config['jujuci-url'])
+    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] == '':