Ubuntu CI Engine

Merge lp://qastaging/~doanac/uci-engine/2-no-jenkins into lp://qastaging/uci-engine

  1. 2-no-jenkins
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 457
Merged at revision: 458
Proposed branch: lp://qastaging/~doanac/uci-engine/2-no-jenkins
Merge into: lp://qastaging/uci-engine
Prerequisite: lp://qastaging/~doanac/uci-engine/1-run-worker-no-jenkins
Diff against target: 2856 lines (+329/-2205)
29 files modified
charms/precise/lander-jenkins/hooks/start (+0/-7)
charms/precise/lander-jenkins/hooks/stop (+0/-1)
charms/precise/lander-jenkins/lib/charmhelpers/core/hookenv.py (+0/-395)
charms/precise/lander-jenkins/lib/charmhelpers/core/host.py (+0/-291)
charms/precise/lander-jenkins/lib/charmhelpers/fetch/__init__.py (+0/-279)
charms/precise/lander-jenkins/lib/charmhelpers/fetch/archiveurl.py (+0/-48)
charms/precise/lander-jenkins/lib/charmhelpers/fetch/bzrurl.py (+0/-49)
charms/precise/lander-jenkins/templates/jobs/lander_archiver.xml (+0/-49)
charms/precise/lander-jenkins/templates/jobs/lander_branch_source_builder.xml (+0/-76)
charms/precise/lander-jenkins/templates/jobs/lander_image_builder.xml (+0/-76)
charms/precise/lander-jenkins/templates/jobs/lander_master.xml (+0/-334)
charms/precise/lander-jenkins/templates/jobs/lander_ppa_assigner.xml (+0/-76)
charms/precise/lander-jenkins/templates/jobs/lander_ppa_free.xml (+0/-76)
charms/precise/lander-jenkins/templates/jobs/lander_publisher.xml (+0/-76)
charms/precise/lander-jenkins/templates/jobs/lander_test_runner.xml (+0/-76)
charms/precise/lander-jenkins/templates/users/config.xml (+0/-25)
charms/precise/lander/Makefile (+24/-0)
charms/precise/lander/cm.py (+172/-0)
charms/precise/lander/config-manager.txt (+5/-0)
charms/precise/lander/config.yaml (+0/-40)
charms/precise/lander/hooks/hooks.py (+29/-202)
charms/precise/lander/metadata.yaml (+10/-7)
charms/precise/python-django/metadata.yaml (+2/-2)
juju-deployer/configs/lander_http_vhost (+19/-0)
juju-deployer/deploy.py (+1/-1)
juju-deployer/lander.yaml.tmpl (+15/-16)
juju-deployer/relations.yaml (+3/-2)
lander/bin/json_status_cgi.py (+48/-0)
lander/lander/run_worker.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/2-no-jenkins
Reviewer Review Type Date Requested Status
Evan (community) Approve
Vincent Ladeuil (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+217091@code.qastaging.launchpad.net

Commit message

lander: remove jenkins from deployment

This converts the lander-jenkins charm into a lander charm that just does the setup we need without installing jenkins. It also adds a new juju-relation between the lander and webui so the webui can show if the lander is online or not.

This also sets up an Apache server on the lander that shows a list of all the logs generated while handling tickets.

Description of the change

Now that we don't need jenkins, update our deployment logic to get rid of it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:452
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/535/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/535/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:453
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/541/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/541/rebuild

review: Approve (continuous-integration)
Revision history for this message
Vincent Ladeuil (vila) wrote :

Nice numbers on the diffstats ;)

2798 +sys.path.append(os.path.join(os.path.dirname(__file__), '../../ci-utils'))

Always use abspath() when dealing with __file__, if the current dir change after the import, the path is wrong. That's unlikely with *this* script but why take the risk ?

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

> Nice numbers on the diffstats ;)
>
> 2798 +sys.path.append(os.path.join(os.path.dirname(__file__), '../../ci-
> utils'))
>
> Always use abspath() when dealing with __file__, if the current dir change
> after the import, the path is wrong. That's unlikely with *this* script but
> why take the risk ?

I don't think that's technically possible, but its easy enough to change

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:455
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/545/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/545/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) wrote :

vila - revno 455 fixes your issue

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:456
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/547/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/547/rebuild

review: Approve (continuous-integration)
Revision history for this message
Vincent Ladeuil (vila) :
review: Approve
Revision history for this message
Evan (ev) wrote :

Glorious. We'll want to update lp:~ev/uci-engine/update-sourcecode to account for this new use of config-manager. Vincent, you mentioned on the call yesterday that you were cleaning up that branch. Do you have it pushed somewhere?

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

> Glorious. We'll want to update lp:~ev/uci-engine/update-sourcecode to account
> for this new use of config-manager.

> Vincent, you mentioned on the call
> yesterday that you were cleaning up that branch. Do you have it pushed
> somewhere?

Not yet but I'll probably merge trunk before submitting and will catch up at that time.

Revision history for this message
Ubuntu CI Bot (uci-bot) wrote :

Attempt to merge into lp:uci-engine failed due to conflicts:

text conflict in juju-deployer/relations.yaml

lp://qastaging/~doanac/uci-engine/2-no-jenkins updated
457. By Andy Doan

merge with trunk

fix conflict in relations.yaml where cprov recently added one

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