Merge lp://qastaging/~doanac/uci-engine/restish-django into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 669
Merged at revision: 667
Proposed branch: lp://qastaging/~doanac/uci-engine/restish-django
Merge into: lp://qastaging/uci-engine
Diff against target: 269 lines (+123/-22)
4 files modified
charms/precise/restish/config.yaml (+6/-1)
charms/precise/restish/hooks/hooks.py (+71/-20)
charms/precise/restish/metadata.yaml (+6/-0)
charms/precise/restish/unit_tests/test_hooks.py (+40/-1)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/restish-django
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Celso Providelo (community) Approve
Review via email: mp+226404@code.qastaging.launchpad.net

Commit message

restish charm: update it to support a django app

This adds the ability of the restish charm to support django as a
framework. This really makes this charm the "wsgi app" charm, but
we can do bzr renames another day

Description of the change

I was looking at fixing the django charm to match our new code layout when it hit me: Our restish charm can almost do this now and its MUCH MUCH MUCH cleaner and testable. This adds the missing pieces to the charm.

In the future we should just rename this charm something like "wsgi" since it handles multiple frameworks now.

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Celso Providelo (cprov) wrote :

Andy,

At the end, it is becoming a much simpler problem. Amazing progress in this.

I have a cople of diff comments for your consideration, but none of them are blockers. Feel free to land it and unblock the dependent branches.

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

You had 2 good points. I think I'll address the one simple one now and then get this merged. We can revisit the other later.

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu CI Bot (uci-bot) wrote :
Download full text (42.9 KiB)

The attempt to merge lp:~doanac/uci-engine/restish-django into lp:uci-engine failed. Below is the output from the failed tests.

Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Checking juju status
Preparing local branch upload...
Uploading local branch, fingerprint fd76eac46a862249a8ab0ced4d84f1a1e835e0d5
Private PPAs only is DISABLED (CI_PRIVATE_PPAS_ONLY: 0)
Building charm: chroot-builder
Building charm: rabbitmq-worker
Building charm: lander
Building charm: system-image-server
Building charm: python-django
Building charm: restish
Building charm: webui
Running juju-deployer -v -c /tmp/tmpysDKFR/deployer/branch-source-builder.yaml -c /tmp/tmpysDKFR/deployer/gatekeeper.yaml -c /tmp/tmpysDKFR/deployer/image-builder.yaml -c /tmp/tmpysDKFR/deployer/lander.yaml -c /tmp/tmpysDKFR/deployer/nf-stats-service.yaml -c /tmp/tmpysDKFR/deployer/ppa-assigner.yaml -c /tmp/tmpysDKFR/deployer/production-only.yaml -c /tmp/tmpysDKFR/deployer/publisher.yaml -c /tmp/tmpysDKFR/deployer/relations.yaml -c /tmp/tmpysDKFR/deployer/test-runner.yaml -c /tmp/tmpysDKFR/deployer/ticket-system.yaml -c /tmp/tmpysDKFR/deployer/webui.yaml ci-airline
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmpysDKFR/deployer/branch-source-builder.yaml', '-c', '/tmp/tmpysDKFR/deployer/gatekeeper.yaml', '-c', '/tmp/tmpysDKFR/deployer/image-builder.yaml', '-c', '/tmp/tmpysDKFR/deployer/lander.yaml', '-c', '/tmp/tmpysDKFR/deployer/nf-stats-service.yaml', '-c', '/tmp/tmpysDKFR/deployer/ppa-assigner.yaml', '-c', '/tmp/tmpysDKFR/deployer/production-only.yaml', '-c', '/tmp/tmpysDKFR/deployer/publisher.yaml', '-c', '/tmp/tmpysDKFR/deployer/relations.yaml', '-c', '/tmp/tmpysDKFR/deployer/test-runner.yaml', '-c', '/tmp/tmpysDKFR/deployer/ticket-system.yaml', '-c', '/tmp/tmpysDKFR/deployer/webui.yaml', 'ci-airline']' returned non-zero exit status 1

INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/tmpA9XmIV
INFO:root:virtualenv created in 296.43s.
INFO:root:Deploying.
DEBUG:keystoneclient.session:REQ: curl -i -X POST https://keystone.canonistack.canonical.com:443/v2.0/tokens -H "Content-Type: application/json" -H "User-Agent: python-keystoneclient" -d '{"auth": {"tenantName": "ci-engineering_project", "passwordCredentials": {"username": "ci-engineering", "password": "dTf613tNWqLe"}}}'
INFO:requests.packages.urllib3.connectionpool:Starting new HTTPS connection (1): keystone.canonistack.canonical.com
DEBUG:requests.packages.urllib3.connectionpool:"POST /v2.0/tokens HTTP/1.1" 200 7170
DEBUG:keystoneclient.session:RESP: [200] CaseInsensitiveDict({'date': 'Fri, 11 Jul 2014 15:22:00 GMT', 'vary': 'X-Auth-Token', 'content-length': '7170', 'content-type': 'application/json'})
RESP BODY: {"access": {"token": {"issued_at": "2014-07-11T15:22:00.619937", "expires": "2014-07-12T15:22:00Z", "id": "008c5a85625f4893a5577358ad2812be", "tenant": {"description": "ci-engineering_project", "enabled": true, "...

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