Merge lp://qastaging/~doanac/uci-engine/rabbit-cron into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 676
Merged at revision: 680
Proposed branch: lp://qastaging/~doanac/uci-engine/rabbit-cron
Merge into: lp://qastaging/uci-engine
Diff against target: 103 lines (+56/-1)
4 files modified
charms/precise/rabbitmq-worker/config.yaml (+8/-0)
charms/precise/rabbitmq-worker/hooks/hooks.py (+22/-0)
charms/precise/rabbitmq-worker/unit_tests/test_hooks.py (+25/-0)
charms/precise/wsgi-app/hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/rabbit-cron
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Francis Ginther Approve
Review via email: mp+226912@code.qastaging.launchpad.net

Commit message

rabbit charm: add ability to support cron commands

Copying from the wsgi-app charm and including a small fix I found
with regards to buggy logic in removing an old symlink

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

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

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

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

Minor point, not worth blocking on.

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

Looks good. I compared the implementation with that in the wsgi-app charm and could find no significant differences. It would be nice if we could eventually create our own charmhelpers module to refactor all of this shared code into. Alas, a problem for another day.

I'll note that there is a charmhelpers.core.symlink() but there is no matching charmhelpers.core.symunlink() and therefore I'm not a fan of using it when we would have to implement our own undo method that may become incompatible by a future change to charmhelpers.core.symlink().

review: Approve
Revision history for this message
Evan (ev) wrote :

On 16 July 2014 12:29, Francis Ginther <email address hidden> wrote:
> Looks good. I compared the implementation with that in the wsgi-app charm and could find no significant differences. It would be nice if we could eventually create our own charmhelpers module to refactor all of this shared code into. Alas, a problem for another day.

It shouldn't be too difficult to get things into charmhelpers.contrib.
Then everyone can benefit from our awesomeness.

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

I agree with the comments. Lets do those changes as a follow-up.

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/rabbit-cron 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...
uploading webui-content.tgz to swift
Checking juju status
Preparing local branch upload...
Uploading local branch, fingerprint a10207d307d760b3c931ee218ef98fdb029468bf
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: wsgi-app
Building charm: webui
Running juju-deployer -v -c /tmp/tmpwGoLAb/deployer/branch-source-builder.yaml -c /tmp/tmpwGoLAb/deployer/gatekeeper.yaml -c /tmp/tmpwGoLAb/deployer/image-builder.yaml -c /tmp/tmpwGoLAb/deployer/lander.yaml -c /tmp/tmpwGoLAb/deployer/nf-stats-service.yaml -c /tmp/tmpwGoLAb/deployer/ppa-assigner.yaml -c /tmp/tmpwGoLAb/deployer/production-only.yaml -c /tmp/tmpwGoLAb/deployer/publisher.yaml -c /tmp/tmpwGoLAb/deployer/relations.yaml -c /tmp/tmpwGoLAb/deployer/test-runner.yaml -c /tmp/tmpwGoLAb/deployer/ticket-system.yaml -c /tmp/tmpwGoLAb/deployer/webui.yaml ci-airline
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmpwGoLAb/deployer/branch-source-builder.yaml', '-c', '/tmp/tmpwGoLAb/deployer/gatekeeper.yaml', '-c', '/tmp/tmpwGoLAb/deployer/image-builder.yaml', '-c', '/tmp/tmpwGoLAb/deployer/lander.yaml', '-c', '/tmp/tmpwGoLAb/deployer/nf-stats-service.yaml', '-c', '/tmp/tmpwGoLAb/deployer/ppa-assigner.yaml', '-c', '/tmp/tmpwGoLAb/deployer/production-only.yaml', '-c', '/tmp/tmpwGoLAb/deployer/publisher.yaml', '-c', '/tmp/tmpwGoLAb/deployer/relations.yaml', '-c', '/tmp/tmpwGoLAb/deployer/test-runner.yaml', '-c', '/tmp/tmpwGoLAb/deployer/ticket-system.yaml', '-c', '/tmp/tmpwGoLAb/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/tmp3rLJLM
INFO:root:virtualenv created in 289.20s.
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': 'Wed, 16 Jul 2014 14:12:09 GMT', 'vary': 'X-Auth-Token', 'content-length': '7170', 'content-type': 'application/json'})
RESP BODY: {"access": {"token": {"issued_at": "2014-07-16T14:12:09.799986", "expires": "2014-07-17T14:12:09Z", "id": "0f17c6b54b8f41ac8ab536fe3e4efc7e", "tenant": {"description": "ci-engineering_project", "enabled": true, "id": "b262f07e0f184b6492a7fba734c345ae", "name": "ci-engineering...

676. By Andy Doan

oops

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

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

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

review: Approve (continuous-integration)

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