Merge lp://staging/~ev/ubuntu-ci-services-itself/better-structure-and-logging-part2 into lp://staging/ubuntu-ci-services-itself
Proposed by
Evan
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ev/ubuntu-ci-services-itself/better-structure-and-logging-part2 |
| Merge into: | lp://staging/ubuntu-ci-services-itself |
| Prerequisite: | lp://staging/~ev/ubuntu-ci-services-itself/better-structure-and-logging |
| Diff against target: |
485 lines (+202/-93) (has conflicts) 8 files modified
branch-source-builder/bsbuilder/run_worker.py (+2/-4) charms/precise/rabbitmq-worker/config.yaml (+2/-2) charms/precise/rabbitmq-worker/hooks/hooks.py (+125/-78) charms/precise/rabbitmq-worker/hooks/test_hooks.py (+34/-0) ci-utils/ci_utils/logger.py (+34/-0) juju-deployer/image-builder.yaml.tmpl (+1/-1) juju-deployer/test-runner.yaml.tmpl (+1/-1) test_runner/tstrun/run_worker.py (+3/-7) Text conflict in charms/precise/rabbitmq-worker/hooks/hooks.py |
| To merge this branch: | bzr merge lp://staging/~ev/ubuntu-ci-services-itself/better-structure-and-logging-part2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical CI Engineering | Pending | ||
|
Review via email:
|
|||
Description of the change
WIP.
To post a comment you must log in.
Unmerged revisions
- 323. By Evan
-
Export, not env. The former ensures the variable gets passed through to run_worker.
- 322. By Evan
-
Don't collide on names with the logging module.
- 321. By Evan
-
Fix writing of upstart job and add a test for it.
- 320. By Evan
-
Oops. Don't always return non-zero.
- 319. By Evan
-
Add a test for create_dirs in the rabbitmq-worker charm.
- 318. By Evan
-
Kill globals.
- 317. By Evan
-
Create the config dir. Support upgrading the charm by reinstalling it. Log the error when the charm fails.
- 316. By Evan
-
Fix tarball extraction code and set dir permissions appropriately.
- 315. By Evan
-
Fix reference to user and group on config object.
- 314. By Evan
-
Fix references to uid.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
