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

Proposed by Martin Packman
Status: Merged
Approved by: Martin Packman
Approved revision: 49
Merged at revision: 49
Proposed branch: lp:~gz/charms/precise/juju-reports/cidata-url
Merge into: lp:~juju-qa/charms/precise/juju-reports/trunk
Diff against target: 47 lines (+9/-3)
2 files modified
config.yaml (+4/-0)
hooks/common.py (+5/-3)
To merge this branch: bzr merge lp:~gz/charms/precise/juju-reports/cidata-url
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+246213@code.launchpad.net

Description of the change

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?

To post a comment you must log in.
49. By Martin Packman on 2015-01-12

Add cidata-url config setting for referencing build artifacts

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 'config.yaml'
2--- config.yaml 2014-11-10 14:31:29 +0000
3+++ config.yaml 2015-01-12 19:12:10 +0000
4@@ -44,6 +44,10 @@
5 type: string
6 default: http://juju-ci.vapour.ws:8080
7 description: "The Jenkins URL to use for retrieving Juju CI data."
8+ cidata-url:
9+ type: string
10+ default: http://data.vapour.ws/juju-ci/products
11+ description: "The S3 mirror URL to use for linking build artifacts."
12 aws-access-key:
13 type: string
14 default: ""
15
16=== modified file 'hooks/common.py'
17--- hooks/common.py 2014-11-21 16:47:22 +0000
18+++ hooks/common.py 2015-01-12 19:12:10 +0000
19@@ -35,8 +35,9 @@
20 return os.path.join(source_path, 'resources/{}.template'.format(name))
21
22
23-def install_ini(mongo_url, gh_token, jujuci_url, token, error_email,
24- error_email_from, cloud_health_failure_threshold, source_path):
25+def install_ini(mongo_url, gh_token, jujuci_url, cidata_url, token,
26+ error_email, error_email_from, cloud_health_failure_threshold,
27+ source_path):
28 config = ConfigParser()
29 path = get_template_path(INI, source_path)
30 if not os.path.exists(path):
31@@ -45,6 +46,7 @@
32 config.set('app:main', 'mongo.url', mongo_url)
33 config.set('app:main', 'gh_token', gh_token)
34 config.set('app:main', 'jujuci.url', jujuci_url)
35+ config.set('app:main', 'cidata.url', cidata_url)
36 config.set('app:main', 'charm_bundle_test_token', token)
37 config.set('app:main', 'home', HOME)
38 config.set('app:main', 'error_email', error_email)
39@@ -337,7 +339,7 @@
40 make_project_link(source_path, config['source'], config['revno'])
41 return
42 ini = install_ini(mongo_url, config['gh-token'], config['jujuci-url'],
43- config['charm-bundle-test-token'],
44+ config['cidata-url'], config['charm-bundle-test-token'],
45 config['error-email'], config['error-email-from'],
46 config['cloud-health-failure-threshold'], source_path)
47 configure_s3(config, source_path)

Subscribers

People subscribed via source and target branches

to all changes: