Merge lp:~fginther/charms/precise/ubuntu-ci-services-itself/lander-fix-master into lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander

Proposed by Francis Ginther
Status: Merged
Merged at revision: 24
Proposed branch: lp:~fginther/charms/precise/ubuntu-ci-services-itself/lander-fix-master
Merge into: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander
Diff against target: 12 lines (+2/-0)
1 file modified
hooks/hooks.py (+2/-0)
To merge this branch: bzr merge lp:~fginther/charms/precise/ubuntu-ci-services-itself/lander-fix-master
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+200936@code.launchpad.net

Commit message

Add jenkins master job and token as config items.

Description of the change

Add jenkins master job and token as config items.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2014-01-08 20:25:24 +0000
3+++ hooks/hooks.py 2014-01-08 23:16:25 +0000
4@@ -62,6 +62,8 @@
5 'password': config['bot_password'],
6 'hostname': hostname,
7 'port': 8080, # the jenkins charm hardcodes 8080
8+ 'master_job': 'lander_master',
9+ 'job_token': 'BUILD_ME',
10 })
11
12 rfile = _relation_file(config)

Subscribers

People subscribed via source and target branches