Merge lp:~sylvain-pineau/checkbox/tarmac-lxc-fix into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4042
Merged at revision: 4042
Proposed branch: lp:~sylvain-pineau/checkbox/tarmac-lxc-fix
Merge into: lp:checkbox
Diff against target: 24 lines (+1/-2)
2 files modified
support/requirements/deb-base.txt (+0/-1)
test-in-lxc.sh (+1/-1)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/tarmac-lxc-fix
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+273872@code.launchpad.net

Description of the change

a small fix to allow our tarmac lander to do its job.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved (we'll revert this commit as soon as we have a better solution)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'support/requirements/deb-base.txt'
2--- support/requirements/deb-base.txt 2014-04-02 13:19:07 +0000
3+++ support/requirements/deb-base.txt 2015-10-08 16:49:53 +0000
4@@ -9,7 +9,6 @@
5 python-setuptools
6 python-virtualenv
7 python3
8-python3-dev
9 python3-distutils-extra
10 python3-pkg-resources
11 python3-setuptools
12
13=== modified file 'test-in-lxc.sh'
14--- test-in-lxc.sh 2015-04-16 21:53:51 +0000
15+++ test-in-lxc.sh 2015-10-08 16:49:53 +0000
16@@ -70,7 +70,7 @@
17 if ! sudo $LXC_LS |grep -q $pristine_container; then
18 step="[$target] creating pristine container"
19 echo $step
20- if ! /usr/bin/time -o $TIMING sudo $LXC_CREATE -n $pristine_container -t ubuntu -- -r $target --user=$CONTAINER_USER --packages=python-software-properties,software-properties-common >$LOG_DIR/$target.pristine.log 2>$LOG_DIR/$target.pristine.err; then
21+ if ! /usr/bin/time -o $TIMING sudo $LXC_CREATE -n $pristine_container -t ubuntu -- -r $target --user=$CONTAINER_USER --packages=python-software-properties,software-properties-common,python3-dev >$LOG_DIR/$target.pristine.log 2>$LOG_DIR/$target.pristine.err; then
22 outcome=1
23 echo "[$target] Unable to create pristine container!"
24 echo "[$target] stdout: $(pastebinit $LOG_DIR/$target.pristine.log)"

Subscribers

People subscribed via source and target branches