The Open Compute Project

Merge lp:~bladernr/opencompute/fix-ocp-checkbox into lp:opencompute/checkbox

  1. fix-ocp-checkbox
  2. Merge into checkbox
Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: 2176
Merged at revision: 2176
Proposed branch: lp:~bladernr/opencompute/fix-ocp-checkbox
Merge into: lp:opencompute/checkbox
Diff against target: 46 lines (+4/-0)
4 files modified
debian/changelog (+1/-0)
jobs/TC-003-0003-Network_Performance.txt.in (+1/-0)
po/POTFILES.in (+1/-0)
setup.cfg (+1/-0)
To merge this branch: bzr merge lp:~bladernr/opencompute/fix-ocp-checkbox
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+218868@code.launchpad.net

Description of the change

Fixes things that caused build to fail (missing lines in POTFILES.in and setup.cfg and missing environ directive in a job file).

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-21 20:52:04 +0000
3+++ debian/changelog 2014-05-08 19:02:52 +0000
4@@ -4,6 +4,7 @@
5 * incremented version
6 * rebased on the final version of checkbox
7 * resolved several unittest failures
8+ * fixed missing entries in POTFILES.in and setup.cfg
9
10 -- Jeff Lane <jeffrey.lane@canonical.com> Mon, 21 Apr 2014 16:49:04 -0400
11
12
13=== modified file 'jobs/TC-003-0003-Network_Performance.txt.in'
14--- jobs/TC-003-0003-Network_Performance.txt.in 2014-05-07 06:12:16 +0000
15+++ jobs/TC-003-0003-Network_Performance.txt.in 2014-05-08 19:02:52 +0000
16@@ -1,6 +1,7 @@
17 plugin: shell
18 name: TC-003-0003-001-Network_performance
19 user: root
20+environ: NETWORK_INTERFACE
21 requires:
22 package.name == 'iperf'
23 command: network test -i $NETWORK_INTERFACE -t iperf --fail-threshold 90
24
25=== modified file 'po/POTFILES.in'
26--- po/POTFILES.in 2014-04-21 20:43:46 +0000
27+++ po/POTFILES.in 2014-05-08 19:02:52 +0000
28@@ -21,6 +21,7 @@
29 [type: gettext/rfc822deb] jobs/TC-001-0002-Platform_Controller_Hub.txt.in
30 [type: gettext/rfc822deb] jobs/TC-002-0011-System_Log.txt.in
31 [type: gettext/rfc822deb] jobs/TC-003-0001-Hardware_Information.txt.in
32+[type: gettext/rfc822deb] jobs/TC-003-0003-Network_Performance.txt.in
33 [type: gettext/rfc822deb] jobs/usb.txt.in
34 [type: gettext/rfc822deb] jobs/virtualization.txt.in
35 checkbox/application.py
36
37=== modified file 'setup.cfg'
38--- setup.cfg 2014-04-21 20:43:46 +0000
39+++ setup.cfg 2014-05-08 19:02:52 +0000
40@@ -27,5 +27,6 @@
41 "jobs/TC-001-0002-Platform_Controller_Hub.txt.in",
42 "jobs/TC-002-0011-System_Log.txt.in",
43 "jobs/TC-003-0001-Hardware_Information.txt.in",
44+ "jobs/TC-003-0003-Network_Performance.txt.in",
45 "jobs/usb.txt.in",
46 "jobs/virtualization.txt.in"))]

Subscribers

People subscribed via source and target branches