Merge lp:~cjohnston/ubuntu-ci-services-itself/add-uci-engine-again into lp:~canonical-ci-engineering/ubuntu-ci-services-itself/tarmac-config

Proposed by Chris Johnston on 2014-05-29
Status: Merged
Approved by: Chris Johnston on 2014-05-29
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/add-uci-engine-again
Merge into: lp:~canonical-ci-engineering/ubuntu-ci-services-itself/tarmac-config
Diff against target: 22 lines (+6/-6)
1 file modified
tarmac.conf (+6/-6)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/add-uci-engine-again
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) 2014-05-29 Approve on 2014-05-29
Review via email: mp+221423@code.launchpad.net

Commit message

Add lp:uci-engine back to tarmac

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

Welcome back !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tarmac.conf'
2--- tarmac.conf 2014-05-28 14:32:59 +0000
3+++ tarmac.conf 2014-05-29 16:12:51 +0000
4@@ -1,12 +1,12 @@
5 [Tarmac]
6 log_file = /home/ubuntu/tarmac.log
7
8-#[lp:uci-engine]
9-#tree_dir = /home/ubuntu/projects/uci-engine
10-#voting_criteria = Approve >=1
11-#commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
12-#verify_command = ./tarmac.sh
13-#rejected_branch_status = Work in progress
14+[lp:uci-engine]
15+tree_dir = /home/ubuntu/projects/uci-engine
16+voting_criteria = Approve >=1
17+commit_message_template = [r=<approved_by>] <commit_message> <bugs_fixed> from <author>
18+verify_command = export CI_DEPS_LOCAL=/home/ubuntu/projects/uci-deps && TMPFS=1 ./tarmac.sh
19+rejected_branch_status = Work in progress
20
21 [lp:uci-engine/mt-hood]
22 tree_dir = /home/ubuntu/projects/uci-engine-mt-hood

Subscribers

People subscribed via source and target branches