Checkbox

Merge lp:~roadmr/checkbox/cdts-fixes into lp:checkbox

  1. cdts-fixes
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 2983
Merged at revision: 2982
Proposed branch: lp:~roadmr/checkbox/cdts-fixes
Merge into: lp:checkbox
Diff against target: 20 lines (+2/-1)
1 file modified
providers/plainbox-provider-checkbox/jobs/info.txt.in (+2/-1)
To merge this branch: bzr merge lp:~roadmr/checkbox/cdts-fixes
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+218669@code.launchpad.net

Commit message

5164114 providers:checkbox: acpi_sleep_attachment should succed and report even if acpi/sleep doesn't exist (LP: #1316695)
37a55b3 providers:checkbox: installer_debug.gz job should run as root (LP: #1316696)

Description of the change

Fixes two small job bugs:

5164114 providers:checkbox: acpi_sleep_attachment should succed and report even if acpi/sleep doesn't exist (LP: #1316695)
37a55b3 providers:checkbox: installer_debug.gz job should run as root (LP: #1316696)

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/jobs/info.txt.in'
2--- providers/plainbox-provider-checkbox/jobs/info.txt.in 2014-04-07 16:33:10 +0000
3+++ providers/plainbox-provider-checkbox/jobs/info.txt.in 2014-05-07 17:29:02 +0000
4@@ -126,7 +126,7 @@
5
6 plugin: attachment
7 id: acpi_sleep_attachment
8-command: [ -e /proc/acpi/sleep ] && cat /proc/acpi/sleep
9+command: [ -e /proc/acpi/sleep ] && cat /proc/acpi/sleep || echo "No /proc/acpi/sleep found"
10 estimated_duration: 0.5
11 _description: Attaches the contents of /proc/acpi/sleep if it exists.
12
13@@ -180,6 +180,7 @@
14
15 plugin: attachment
16 id: installer_debug.gz
17+user: root
18 command: [ -e /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug
19 estimated_duration: 0.1
20 _description: Attaches the installer debug log if it exists.

Subscribers

People subscribed via source and target branches