Merge lp:~cypressyew/checkbox/p-p-c-typo into lp:checkbox

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Po-Hsu Lin
Approved revision: 4179
Merged at revision: 4179
Proposed branch: lp:~cypressyew/checkbox/p-p-c-typo
Merge into: lp:checkbox
Diff against target: 228 lines (+30/-31)
2 files modified
providers/plainbox-provider-checkbox/jobs/info.txt.in (+1/-1)
providers/plainbox-provider-checkbox/po/plainbox-provider-checkbox.pot (+29/-30)
To merge this branch: bzr merge lp:~cypressyew/checkbox/p-p-c-typo
Reviewer Review Type Date Requested Status
Po-Hsu Lin Approve
Review via email: mp+283035@code.launchpad.net

Description of the change

Description fix for bootchart attachment job, and
update the corresponding pot file.

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Minor change, self approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'providers/plainbox-provider-checkbox/jobs/info.txt.in'
--- providers/plainbox-provider-checkbox/jobs/info.txt.in 2016-01-12 14:09:39 +0000
+++ providers/plainbox-provider-checkbox/jobs/info.txt.in 2016-01-19 04:10:03 +0000
@@ -258,7 +258,7 @@
258category_id: 2013.com.canonical.plainbox::info258category_id: 2013.com.canonical.plainbox::info
259id: installer_bootchart.tgz259id: installer_bootchart.tgz
260command: [ -f /var/log/installer/bootchart.tgz ] && base64 /var/log/installer/bootchart.tgz260command: [ -f /var/log/installer/bootchart.tgz ] && base64 /var/log/installer/bootchart.tgz
261_description: installs the installer bootchart tarball if it exists.261_description: Attach the installer bootchart tarball if it exists.
262262
263plugin: attachment263plugin: attachment
264category_id: 2013.com.canonical.plainbox::info264category_id: 2013.com.canonical.plainbox::info
265265
=== modified file 'providers/plainbox-provider-checkbox/po/plainbox-provider-checkbox.pot'
--- providers/plainbox-provider-checkbox/po/plainbox-provider-checkbox.pot 2016-01-15 06:44:07 +0000
+++ providers/plainbox-provider-checkbox/po/plainbox-provider-checkbox.pot 2016-01-19 04:10:03 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-01-15 14:43+0800\n"11"POT-Creation-Date: 2016-01-19 12:03+0800\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1619,7 +1619,7 @@
16191619
1620#. description1620#. description
1621#: ../jobs/info.txt.in:2611621#: ../jobs/info.txt.in:261
1622msgid "installs the installer bootchart tarball if it exists."1622msgid "Attach the installer bootchart tarball if it exists."
1623msgstr ""1623msgstr ""
16241624
1625#. description1625#. description
@@ -2977,61 +2977,60 @@
2977#. description2977#. description
2978#: ../jobs/miscellanea.txt.in:992978#: ../jobs/miscellanea.txt.in:99
2979msgid ""2979msgid ""
2980"Test to verify that the system booted in EFI mode rather than Legacy/BIOS "2980"Test to verify that the system booted in EFI mode with Secure Boot active."
2981"mode."
2982msgstr ""2981msgstr ""
29832982
2984#. description2983#. description
2985#: ../jobs/miscellanea.txt.in:1162984#: ../jobs/miscellanea.txt.in:110
2986msgid ""2985msgid ""
2987"This will gather some info about the BMC itself for diagnostic purposes. "2986"This will gather some info about the BMC itself for diagnostic purposes. "
2988"This will not works on non-IPMI systems like AMT and blade/sled type systems."2987"This will not works on non-IPMI systems like AMT and blade/sled type systems."
2989msgstr ""2988msgstr ""
29902989
2991#. summary2990#. summary
2992#: ../jobs/miscellanea.txt.in:1192991#: ../jobs/miscellanea.txt.in:113
2993msgid "Gather BMC Identification info"2992msgid "Gather BMC Identification info"
2994msgstr ""2993msgstr ""
29952994
2996#. description2995#. description
2997#: ../jobs/miscellanea.txt.in:1292996#: ../jobs/miscellanea.txt.in:123
2998msgid "Sanity check of CPU information; fails if CPU is an engineering sample"2997msgid "Sanity check of CPU information; fails if CPU is an engineering sample"
2999msgstr ""2998msgstr ""
30002999
3001#. summary3000#. summary
3002#: ../jobs/miscellanea.txt.in:1313001#: ../jobs/miscellanea.txt.in:125
3003msgid "CPU sanity check"3002msgid "CPU sanity check"
3004msgstr ""3003msgstr ""
30053004
3006#. description3005#. description
3007#: ../jobs/miscellanea.txt.in:1413006#: ../jobs/miscellanea.txt.in:135
3008msgid "Sanity check of DMI system identification data (for servers)"3007msgid "Sanity check of DMI system identification data (for servers)"
3009msgstr ""3008msgstr ""
30103009
3011#. summary3010#. summary
3012#: ../jobs/miscellanea.txt.in:1433011#: ../jobs/miscellanea.txt.in:137
3013msgid "DMI ID sanity check (servers)"3012msgid "DMI ID sanity check (servers)"
3014msgstr ""3013msgstr ""
30153014
3016#. description3015#. description
3017#: ../jobs/miscellanea.txt.in:1533016#: ../jobs/miscellanea.txt.in:147
3018msgid "Sanity check of DMI system identification data (for desktops & laptops)"3017msgid "Sanity check of DMI system identification data (for desktops & laptops)"
3019msgstr ""3018msgstr ""
30203019
3021#. summary3020#. summary
3022#: ../jobs/miscellanea.txt.in:1553021#: ../jobs/miscellanea.txt.in:149
3023msgid "DMI ID sanity check (desktops/laptops)"3022msgid "DMI ID sanity check (desktops/laptops)"
3024msgstr ""3023msgstr ""
30253024
3026#. description3025#. description
3027#: ../jobs/miscellanea.txt.in:1623026#: ../jobs/miscellanea.txt.in:156
3028msgid ""3027msgid ""
3029" Determine if we need to run tests specific to portable computers that may "3028" Determine if we need to run tests specific to portable computers that may "
3030"not apply to desktops."3029"not apply to desktops."
3031msgstr ""3030msgstr ""
30323031
3033#. description3032#. description
3034#: ../jobs/miscellanea.txt.in:1713033#: ../jobs/miscellanea.txt.in:165
3035msgid ""3034msgid ""
3036"Test that the /var/crash directory doesn't contain anything. Lists the files "3035"Test that the /var/crash directory doesn't contain anything. Lists the files "
3037"contained within if it does, or echoes the status of the directory (doesn't "3036"contained within if it does, or echoes the status of the directory (doesn't "
@@ -3039,32 +3038,32 @@
3039msgstr ""3038msgstr ""
30403039
3041#. description3040#. description
3042#: ../jobs/miscellanea.txt.in:1783041#: ../jobs/miscellanea.txt.in:172
3043msgid ""3042msgid ""
3044"Checks that a specified sources list file contains the requested repositories"3043"Checks that a specified sources list file contains the requested repositories"
3045msgstr ""3044msgstr ""
30463045
3047#. summary3046#. summary
3048#: ../jobs/miscellanea.txt.in:1873047#: ../jobs/miscellanea.txt.in:181
3049msgid "PXE verification test of device {__index__} ({interface})"3048msgid "PXE verification test of device {__index__} ({interface})"
3050msgstr ""3049msgstr ""
30513050
3052#. purpose3051#. purpose
3053#: ../jobs/miscellanea.txt.in:1893052#: ../jobs/miscellanea.txt.in:183
3054msgid ""3053msgid ""
3055"This test will verify that you have attempted to PXE boot this machine from "3054"This test will verify that you have attempted to PXE boot this machine from "
3056"the network device {__index__} ({interface})."3055"the network device {__index__} ({interface})."
3057msgstr ""3056msgstr ""
30583057
3059#. steps3058#. steps
3060#: ../jobs/miscellanea.txt.in:1923059#: ../jobs/miscellanea.txt.in:186
3061msgid ""3060msgid ""
3062"1. Prior to running this test, you should have attempted to boot this system "3061"1. Prior to running this test, you should have attempted to boot this system "
3063"via PXE on every Network Port available."3062"via PXE on every Network Port available."
3064msgstr ""3063msgstr ""
30653064
3066#. verification3065#. verification
3067#: ../jobs/miscellanea.txt.in:1943066#: ../jobs/miscellanea.txt.in:188
3068msgid ""3067msgid ""
3069"1. Select Yes if you successfully used PXE boot this system using the NIC "3068"1. Select Yes if you successfully used PXE boot this system using the NIC "
3070"{interface} 2. Select No if you did not attempt to PXE boot this system "3069"{interface} 2. Select No if you did not attempt to PXE boot this system "
@@ -3073,27 +3072,27 @@
3073msgstr ""3072msgstr ""
30743073
3075#. summary3074#. summary
3076#: ../jobs/miscellanea.txt.in:2063075#: ../jobs/miscellanea.txt.in:200
3077msgid ""3076msgid ""
3078"Remote Shared IPMI verification test for device {__index__} ({interface})"3077"Remote Shared IPMI verification test for device {__index__} ({interface})"
3079msgstr ""3078msgstr ""
30803079
3081#. purpose3080#. purpose
3082#: ../jobs/miscellanea.txt.in:2083081#: ../jobs/miscellanea.txt.in:202
3083msgid ""3082msgid ""
3084"This test will verify that you have attempted IPMI control of this machine "3083"This test will verify that you have attempted IPMI control of this machine "
3085"from the network device {__index__} ({interface})."3084"from the network device {__index__} ({interface})."
3086msgstr ""3085msgstr ""
30873086
3088#. steps3087#. steps
3089#: ../jobs/miscellanea.txt.in:2103088#: ../jobs/miscellanea.txt.in:204
3090msgid ""3089msgid ""
3091"1. Prior to running this test, you should have configured and used IPMI to "3090"1. Prior to running this test, you should have configured and used IPMI to "
3092"power this machine off and on using every Network Port available."3091"power this machine off and on using every Network Port available."
3093msgstr ""3092msgstr ""
30943093
3095#. verification3094#. verification
3096#: ../jobs/miscellanea.txt.in:2123095#: ../jobs/miscellanea.txt.in:206
3097msgid ""3096msgid ""
3098"1. Select Yes if you successfully used IPMI to remotely power this system "3097"1. Select Yes if you successfully used IPMI to remotely power this system "
3099"off and on using the NIC {interface} 2. Select No if you did not attempt to "3098"off and on using the NIC {interface} 2. Select No if you did not attempt to "
@@ -3103,7 +3102,7 @@
3103msgstr ""3102msgstr ""
31043103
3105#. description3104#. description
3106#: ../jobs/miscellanea.txt.in:2203105#: ../jobs/miscellanea.txt.in:214
3107msgid ""3106msgid ""
3108"PURPOSE:\n"3107"PURPOSE:\n"
3109" Some systems do not share IPMI over all NICs but instead have a dedicated "3108" Some systems do not share IPMI over all NICs but instead have a dedicated "
@@ -3122,36 +3121,36 @@
3122msgstr ""3121msgstr ""
31233122
3124#. description3123#. description
3125#: ../jobs/miscellanea.txt.in:2363124#: ../jobs/miscellanea.txt.in:230
3126msgid "Run Firmware Test Suite (fwts) oops tests."3125msgid "Run Firmware Test Suite (fwts) oops tests."
3127msgstr ""3126msgstr ""
31283127
3129#. description3128#. description
3130#: ../jobs/miscellanea.txt.in:2483129#: ../jobs/miscellanea.txt.in:242
3131msgid "Attaches the FWTS oops results log to the submission"3130msgid "Attaches the FWTS oops results log to the submission"
3132msgstr ""3131msgstr ""
31333132
3134#. description3133#. description
3135#: ../jobs/miscellanea.txt.in:2613134#: ../jobs/miscellanea.txt.in:255
3136msgid ""3135msgid ""
3137"If system was installed via MAAS from a cert server, the MAAS version used "3136"If system was installed via MAAS from a cert server, the MAAS version used "
3138"should be contained in /etc/installed-by-maas"3137"should be contained in /etc/installed-by-maas"
3139msgstr ""3138msgstr ""
31403139
3141#. summary3140#. summary
3142#: ../jobs/miscellanea.txt.in:2623141#: ../jobs/miscellanea.txt.in:256
3143msgid "Gets the version of MAAS used to deploy the SUT"3142msgid "Gets the version of MAAS used to deploy the SUT"
3144msgstr ""3143msgstr ""
31453144
3146#. description3145#. description
3147#: ../jobs/miscellanea.txt.in:2703146#: ../jobs/miscellanea.txt.in:264
3148msgid ""3147msgid ""
3149"Retrieve the computer's make and model for easier access than digging "3148"Retrieve the computer's make and model for easier access than digging "
3150"through the dmidecode output."3149"through the dmidecode output."
3151msgstr ""3150msgstr ""
31523151
3153#. summary3152#. summary
3154#: ../jobs/miscellanea.txt.in:2713153#: ../jobs/miscellanea.txt.in:265
3155msgid "Retrieve the computer's make and model"3154msgid "Retrieve the computer's make and model"
3156msgstr ""3155msgstr ""
31573156

Subscribers

People subscribed via source and target branches