lp:~psivaa/uci-engine/lander-jenkins-sub-charm-with-plugin

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:uci-engine/mthood

Canonical CI Engineering: Pending requested 2014-05-09

Diff: 2276 lines (+611/-298)

70 files modified

TRICKS (+5/-9)
branch-source-builder/bsbuilder/__init__.py (+1/-1)
branch-source-builder/bsbuilder/resources/v1.py (+2/-3)
branch-source-builder/bsbuilder/run_worker.py (+1/-1)
branch-source-builder/bsbuilder/tests/test_upload.py (+1/-1)
charms/precise/lander-jenkins/hooks/hooks.py (+61/-34)
charms/precise/python-django/hooks/hooks.py (+12/-7)
charms/precise/rabbitmq-worker/hooks/hooks.py (+38/-15)
charms/precise/restish/hooks/hooks.py (+24/-10)
charms/precise/webui/hooks/hooks.py (+9/-0)
ci-utils/ci_utils/__init__.py (+1/-1)
ci-utils/ci_utils/amqp_utils.py (+13/-1)
ci-utils/ci_utils/create_db.py (+1/-1)
ci-utils/ci_utils/restish_utils.py (+1/-1)
ci-utils/ci_utils/setup_helper.py (+1/-1)
ci-utils/ci_utils/tastypie/resource.py (+1/-1)
ci-utils/ci_utils/tastypie/test.py (+1/-1)
ci-utils/ci_utils/tests/test_amqp.py (+8/-1)
ci-utils/ci_utils/tests/test_restish.py (+1/-1)
ci-utils/ci_utils/ticket_states.py (+1/-1)
cli/ci_libs/__init__.py (+1/-1)
cli/tests/test_file_handler.py (+1/-1)
debian/control (+1/-1)
debian/copyright (+1/-1)
image-builder/imagebuilder/__init__.py (+1/-1)
image-builder/imagebuilder/cloud_image.py (+28/-2)
image-builder/imagebuilder/resources/v1.py (+2/-3)
image-builder/imagebuilder/run_worker.py (+1/-1)
image-builder/imagebuilder/tests/test_api_v1.py (+1/-1)
image-builder/imagebuilder/tests/test_modify_cloud_image.py (+32/-1)
juju-deployer/branch-source-builder.yaml.tmpl (+2/-2)
juju-deployer/configs/unit_config.yaml.tmpl (+2/-0)
juju-deployer/deploy.py (+81/-15)
juju-deployer/image-builder.yaml.tmpl (+2/-2)
juju-deployer/lander.yaml.tmpl (+4/-4)
juju-deployer/ppa-assigner.yaml.tmpl (+1/-1)
juju-deployer/production-only.yaml (+1/-1)
juju-deployer/test-runner.yaml.tmpl (+2/-3)
juju-deployer/test_deploy.py (+1/-0)
juju-deployer/ticket-system.yaml.tmpl (+1/-1)
lander/bin/lander_merge_parameters.py (+1/-1)
lander/bin/lander_service_wrapper.py (+7/-14)
lander/bin/ticket_api.py (+1/-1)
lander/lander/__init__.py (+1/-1)
lander/lander/resources/v1.py (+1/-1)
lander/lander/tests/test_service_wrapper.py (+23/-17)
lander/lander/tests/test_v1.py (+1/-1)
ppa-assigner/local_settings.py.example (+1/-1)
ppa-assigner/ppa_assigner/__init__.py (+1/-1)
ppa-assigner/ppa_assigner/launchpad.py (+1/-1)
run-tests (+1/-1)
tarmac.sh (+1/-1)
test_runner/run_test.py (+19/-13)
test_runner/tstrun/__init__.py (+0/-6)
test_runner/tstrun/resources/root.py (+1/-1)
test_runner/tstrun/resources/v1.py (+2/-4)
test_runner/tstrun/run_worker.py (+65/-43)
test_runner/tstrun/testbed.py (+31/-14)
test_runner/tstrun/wsgi.py (+1/-1)
tests/image_builder/test.py (+9/-2)
tests/run.py (+65/-34)
tests/test_run.py (+21/-0)
tests/test_runner/test.py (+1/-0)
tests/ticket_system/test.py (+1/-0)
ticket_system/project/admin.py (+1/-1)
ticket_system/project/api.py (+1/-1)
ticket_system/project/models.py (+1/-1)
ticket_system/ticket/admin.py (+1/-1)
ticket_system/ticket/tests/test_write_api.py (+1/-1)
ticket_system/ticket_system/__init__.py (+1/-1)

api

Rejected for merging into lp:uci-engine

Francis Ginther: Needs Fixing on 2014-04-15

PS Jenkins bot (community): Approve (continuous-integration) on 2014-04-14

Diff: 74 lines (+20/-15)

2 files modified

charms/precise/lander-jenkins/hooks/hooks.py (+18/-13)
juju-deployer/lander.yaml.tmpl (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

431. By Para Siva on 2014-04-13

Include plugins in lander-jenkins-sub charm pep8 fixes

430. By Para Siva on 2014-04-13

Include plugins in lander-jenkins-sub charm

429. By Andy Doan on 2014-04-11

[r=Evan Dandrea, PS Jenkins bot] lander: convert to using rabbit queues directly instead of the REST API. from Andy Doan

428. By Vincent Ladeuil on 2014-04-11

[r=Evan Dandrea, PS Jenkins bot] Update copyrights. from Vincent Ladeuil

427. By Andy Doan on 2014-04-10

[r=PS Jenkins bot, Evan Dandrea] use common set of constants for queue names

The lander is about to need these, so lets keep them in a single
consistent place.
  from Andy Doan

426. By Vincent Ladeuil on 2014-04-10

[r=PS Jenkins bot, Chris Johnston] Any test failure should make the run fail. from Vincent Ladeuil

425. By Vincent Ladeuil on 2014-04-10

[r=Evan Dandrea, PS Jenkins bot] Remove the need for OS_REQUIRES_TUNNEL by checking if the bootstrap IP address is private before starting a tunnel. 1301502 from Vincent Ladeuil

424. By Chris Johnston on 2014-04-09

[r=Andy Doan, PS Jenkins bot] Fix juju-deployer not being on sys.path from Chris Johnston

423. By Andy Doan on 2014-04-05

[r=Vincent Ladeuil, PS Jenkins bot] Add the ability to upgrade an existing deployment using deploy.py. A new option was added:

 ./juju-deployer/deploy.py --upgrade

This code path will:

1) ensure the deployment has been completed (classic path through our code)
2) all options defined in our deployer yaml files are updated (in case a setting was changed)
3) call upgrade-charm on every deployed service

upgrade-charm runs async and the script currently just exits, so you must run juju-status a few times afterwards to ensure your upgrade worked as expected. from Andy Doan

422. By Vincent Ladeuil on 2014-04-02

[r=PS Jenkins bot, Evan Dandrea] Fix image builder and test runner test failures. 1292159 from Vincent Ladeuil