Juju Charms Collection
ubuntu-ci-services-itself package

Merge lp://qastaging/~doanac/charms/precise/ubuntu-ci-services-itself/lander into lp://qastaging/~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander

  1. Precise Pangolin (12.04)
  2. lander
  3. Merge into lander
Proposed by Andy Doan
Status: Merged
Approved by: Francis Ginther
Approved revision: 27
Merged at revision: 23
Proposed branch: lp://qastaging/~doanac/charms/precise/ubuntu-ci-services-itself/lander
Merge into: lp://qastaging/~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander
Diff against target: 283 lines (+86/-35)
4 files modified
config.yaml (+10/-0)
hooks/hooks.py (+38/-5)
metadata.yaml (+2/-0)
templates/jobs/lander_master.xml (+36/-30)
To merge this branch: bzr merge lp://qastaging/~doanac/charms/precise/ubuntu-ci-services-itself/lander
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Andy Doan (community) Needs Resubmitting
Review via email: mp+200449@code.qastaging.launchpad.net

Description of the change

This updates the master and ppa-assigner jobs to handle parameters properly. They now are able to determine things like the ppa-assigner's host ip via juju relation ships. It might be easiest to read this commit by commit.

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

FYI - I have a private juju deployer file that can do a full deployment of the ppa-assigner and lander. Let me know if you want a copy (it includes oauth tokens so i can't share publically).

Revision history for this message
Francis Ginther (fginther) wrote :

The jenkins jobs are supposed to pass the params.json file from one job to the next, it's not intended to be created as is being done in templates/jobs/lander-ppa-assigner.xml. I confirmed that this is broken and am investigating.

Revision history for this message
Andy Doan (doanac) wrote :

On 01/06/2014 01:32 PM, Francis Ginther wrote:
> The jenkins jobs are supposed to pass the params.json file from one job to the next, it's not intended to be created as is being done in templates/jobs/lander-ppa-assigner.xml. I confirmed that this is broken and am investigating.

I think I've got this fixed in a branch based on this:

<http://bazaar.launchpad.net/~doanac/charms/precise/ubuntu-ci-services-itself/lander-bsb/revision/27>

if that looks sane, we can just fix it in that MP if that's okay?

lp://qastaging/~doanac/charms/precise/ubuntu-ci-services-itself/lander updated
22. By Francis Ginther

Fix jenkins jobs so that the accumulated json data is passed as a job parameter, update lander_archiver to work with updated script, add datastore config parameters.

23. By Andy Doan

store relationship information

the jenkins jobs will need to know the hostname of each service
connected to it like the ppa-assigner. This stores them under
a fix directory jobs can load dynamically

24. By Andy Doan

add ppa-assigner url to config

25. By Andy Doan

allow charm to interface with amqp

26. By Andy Doan

add bsbuilder config to master

27. By Andy Doan

clarify parameter passing and add progress trigger

parameter passing was being done via a file named child.json. However,
this is really a jenkins parameters file and not really json. This
renames that file and creates it with a few less lines of code.

Revision history for this message
Andy Doan (doanac) wrote :

I've rebased on your branch with a couple of minor updates. I changed your naming of "child.json" to "child.params" since it isn't really a json file. I then added the relationship handling logic to get the ppa-assigner and bsbuilder working.

review: Needs Resubmitting
Revision history for this message
Francis Ginther (fginther) wrote :

Thanks for cleaning up my child.json. I got the first one updated in lander_master, but failed to update the rest. The params file works just as well.

Revision history for this message
Francis Ginther (fginther) wrote :

I'm ok with the relation hooks, if we need to separate them later, we'll do it then.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches