Merge lp:~ev/uci-engine/drop-bsb-4g-ram into lp:uci-engine

Proposed by Evan on 2014-10-13
Status: Rejected
Rejected by: Evan on 2014-10-14
Proposed branch: lp:~ev/uci-engine/drop-bsb-4g-ram
Merge into: lp:uci-engine
Diff against target: 11 lines (+0/-1)
1 file modified
juju-deployer/branch-source-builder.yaml.tmpl (+0/-1)
To merge this branch: bzr merge lp:~ev/uci-engine/drop-bsb-4g-ram
Reviewer Review Type Date Requested Status
Francis Ginther Approve on 2014-10-13
Vincent Ladeuil (community) 2014-10-13 Approve on 2014-10-13
PS Jenkins bot (community) continuous-integration Approve on 2014-10-13
Review via email: mp+238135@code.launchpad.net

Commit message

Drop the 4G of RAM constraint for the BSB. This isn't needed.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Vincent Ladeuil (vila) wrote :

Straightforward.

review: Approve
Francis Ginther (fginther) wrote :

Ditto. +1

review: Approve
Ubuntu CI Bot (uci-bot) wrote :

The attempt to merge lp:~ev/uci-engine/drop-bsb-4g-ram into lp:uci-engine failed. Below is the output from the failed tests.

ERROR:root:/var/lib/lxc not mounted.

Ubuntu CI Bot (uci-bot) wrote :

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

text conflict in juju-deployer/branch-source-builder.yaml.tmpl

Evan (ev) wrote :

Superseded by another branch.

Unmerged revisions

840. By Evan on 2014-10-13

Drop the 4G of RAM constraint for the BSB. This isn't needed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
2--- juju-deployer/branch-source-builder.yaml.tmpl 2014-10-10 10:00:49 +0000
3+++ juju-deployer/branch-source-builder.yaml.tmpl 2014-10-13 11:20:34 +0000
4@@ -3,7 +3,6 @@
5 services:
6 ci-airline-bsb-worker:
7 charm: rabbitmq-worker
8- constraints: "mem=4096M"
9 options:
10 main: ./run-python ./branch-source-builder/bsbuilder/run_worker.py
11 current_code: ${CI_PAYLOAD_URL}

Subscribers

People subscribed via source and target branches

to all changes: