Libertine

Merge lp:~townsend/libertine/fix-lxc-fail-again into lp:libertine

  1. fix-lxc-fail-again
  2. Merge into devel
Proposed by Christopher Townsend
Status: Merged
Approved by: Christopher Townsend
Approved revision: 255
Merged at revision: 254
Proposed branch: lp:~townsend/libertine/fix-lxc-fail-again
Merge into: lp:libertine
Diff against target: 35 lines (+6/-5)
1 file modified
python/libertine/LxcContainer.py (+6/-5)
To merge this branch: bzr merge lp:~townsend/libertine/fix-lxc-fail-again
Reviewer Review Type Date Requested Status
Larry Price Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+298328@code.launchpad.net

Commit message

Only set the LXC log file when the container is about to start.

To post a comment you must log in.
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

FAILED: Continuous integration, rev:254
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/88/console
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/73/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/91
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/76
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/76
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/69/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/69
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/69/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/69/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/69
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/69/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:254
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/8/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/89
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/57
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/57
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/57
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/57
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/74/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/92
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/77
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/77
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/70
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/70/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/70
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/70/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/70
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/70/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/70
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/70/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/8/rebuild

review: Approve (continuous-integration)
Revision history for this message
Larry Price (larryprice) wrote :

just the one inline

review: Needs Fixing
lp:~townsend/libertine/fix-lxc-fail-again updated
255. By Christopher Townsend

Fix typo in method name.

Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:255
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/9/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/90
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/58
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/58
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/58
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/58
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/75/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/93
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/78
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/78
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/71
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/71/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/71
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/71/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/71
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/71/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/71
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/71/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/9/rebuild

review: Approve (continuous-integration)
Revision history for this message
Larry Price (larryprice) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'python/libertine/LxcContainer.py'
2--- python/libertine/LxcContainer.py 2016-06-22 16:26:15 +0000
3+++ python/libertine/LxcContainer.py 2016-06-24 18:05:21 +0000
4@@ -85,11 +85,6 @@
5 self.container_type = "lxc"
6 self.container = lxc_container(container_id)
7
8- if self.container.defined:
9- self.lxc_log_file = os.path.join(tempfile.mkdtemp(), 'lxc-start.log')
10- self.container.append_config_item("lxc.logfile", self.lxc_log_file)
11- self.container.append_config_item("lxc.logpriority", "3")
12-
13 def is_running(self):
14 return self.container.running
15
16@@ -106,6 +101,7 @@
17
18 def start_container(self):
19 if not self.container.running:
20+ self._set_lxc_log()
21 if not self.container.start():
22 self._dump_lxc_log()
23 raise RuntimeError("Container failed to start")
24@@ -308,6 +304,11 @@
25 data = libertine_lxc_mgr_sock.recv(1024)
26 libertine_lxc_mgr_sock.close()
27
28+ def _set_lxc_log(self):
29+ self.lxc_log_file = os.path.join(tempfile.mkdtemp(), 'lxc-start.log')
30+ self.container.append_config_item("lxc.logfile", self.lxc_log_file)
31+ self.container.append_config_item("lxc.logpriority", "3")
32+
33 def _dump_lxc_log(self):
34 with open(self.lxc_log_file, 'r') as fd:
35 for line in fd:

Subscribers

People subscribed via source and target branches