Merge lp:~cypressyew/checkbox-certification/whitelist-location-change into lp:checkbox-certification

Proposed by Po-Hsu Lin on 2014-02-05
Status: Merged
Approved by: Zygmunt Krynicki on 2014-02-05
Approved revision: 645
Merged at revision: 645
Proposed branch: lp:~cypressyew/checkbox-certification/whitelist-location-change
Merge into: lp:checkbox-certification
Diff against target: 75 lines (+10/-5)
5 files modified
bin/checkbox-certification-client (+1/-1)
bin/checkbox-certification-prepare (+2/-2)
bin/checkbox-certification-server (+1/-1)
bin/checkbox-certification-server-soc (+1/-1)
debian/changelog (+5/-0)
To merge this branch: bzr merge lp:~cypressyew/checkbox-certification/whitelist-location-change
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) 2014-02-05 Approve on 2014-02-05
Review via email: mp+204828@code.launchpad.net

Description of the change

Since we're moving whitelists out of checkbox-certificaton, corresponding changes must be made.
Affecting:
bin/checkbox-certification-prepare,
bin/checkbox-certification-server-soc
bin/checkbox-certification-server
bin/checkbox-certification-client

Note that the whitelist location is slightly different in Checkbox.

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote :

Looks good to me, thank you

+1

review: Approve
Po-Hsu Lin (cypressyew) wrote :

Aaah, I didn't notice that Brendan already proposed a branch for this...

Brendan Donegan (brendan-donegan) wrote :

That's ok, I'll delete the other merge request

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/checkbox-certification-client'
2--- bin/checkbox-certification-client 2012-06-05 16:39:06 +0000
3+++ bin/checkbox-certification-client 2014-02-05 07:23:40 +0000
4@@ -8,7 +8,7 @@
5 export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox}
6 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-/usr/share/checkbox}
7 export CHECKBOX_CERTIFICATION_SHARE=${CHECKBOX_CERTIFICATION_SHARE:-.}
8-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_CERTIFICATION_SHARE/data/client-selftest.whitelist $OPTIONS}
9+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_SHARE/data/whitelists/client-selftest.whitelist $OPTIONS}
10
11 # Convenience for defining the PYTHONPATH directory.
12 if [ "$CHECKBOX_SHARE" != "/usr/share/checkbox" ]; then
13
14=== modified file 'bin/checkbox-certification-prepare'
15--- bin/checkbox-certification-prepare 2013-11-15 03:33:08 +0000
16+++ bin/checkbox-certification-prepare 2014-02-05 07:23:40 +0000
17@@ -29,7 +29,7 @@
18 cat >~/run-checkbox.sh <<EOF
19 checkbox-certification-client \
20 --config="checkbox-certification/plugins/submission_info/tags=$TAGS" \
21--W /usr/share/checkbox-certification/data/client-cert.whitelist \
22+-W /usr/share/checkbox/data/whitelists/client-cert.whitelist \
23 --config="checkbox/plugins/launchpad_prompt/email=hardware-certification-devel@canonical.com" \
24 --config="checkbox/plugins/blacklist=" \
25 --log-level=debug
26@@ -55,7 +55,7 @@
27 cat << EOF2 > ~/actually-run-checkbox-stress.sh
28 checkbox-certification-client \
29 --config=\""checkbox-certification/plugins/submission_info/tags=$TAGS\"" \
30- -W /usr/share/checkbox-certification/data/client-stress.whitelist \
31+ -W /usr/share/checkbox/data/whitelists/client-stress.whitelist \
32 --config="checkbox/plugins/launchpad_prompt/email=hardware-certification-devel@canonical.com" \
33 --config="checkbox/plugins/blacklist=" \
34 --config="checkbox-certification/plugins/submission_info/secure_id=$submission_id"
35
36=== modified file 'bin/checkbox-certification-server'
37--- bin/checkbox-certification-server 2012-06-05 16:39:06 +0000
38+++ bin/checkbox-certification-server 2014-02-05 07:23:40 +0000
39@@ -8,7 +8,7 @@
40 export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox}
41 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-/usr/share/checkbox}
42 export CHECKBOX_CERTIFICATION_SHARE=${CHECKBOX_CERTIFICATION_SHARE:-.}
43-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_CERTIFICATION_SHARE/data/server-selftest.whitelist $OPTIONS}
44+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_SHARE/data/whitelists/server-selftest.whitelist $OPTIONS}
45
46 # Convenience for defining the PYTHONPATH directory.
47 if [ "$CHECKBOX_SHARE" != "/usr/share/checkbox" ]; then
48
49=== modified file 'bin/checkbox-certification-server-soc'
50--- bin/checkbox-certification-server-soc 2013-10-04 11:13:51 +0000
51+++ bin/checkbox-certification-server-soc 2014-02-05 07:23:40 +0000
52@@ -8,7 +8,7 @@
53 export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox}
54 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-/usr/share/checkbox}
55 export CHECKBOX_CERTIFICATION_SHARE=${CHECKBOX_CERTIFICATION_SHARE:-.}
56-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_CERTIFICATION_SHARE/data/server-soc-selftest.whitelist $OPTIONS}
57+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_SHARE/data/whitelists/server-soc-selftest.whitelist $OPTIONS}
58
59 # Convenience for defining the PYTHONPATH directory.
60 if [ "$CHECKBOX_SHARE" != "/usr/share/checkbox" ]; then
61
62=== modified file 'debian/changelog'
63--- debian/changelog 2014-02-03 14:27:24 +0000
64+++ debian/changelog 2014-02-05 07:23:40 +0000
65@@ -1,5 +1,10 @@
66 checkbox-certification (0.19) UNRELEASED; urgency=low
67
68+ [ Po-Hsu Lin ]
69+ * Change the whitelist location of checkbox-certification-prepare,
70+ checkbox-certification-server-soc, checkbox-certification-server
71+ and checkbox-certification-client to Checkbox.
72+
73 [ Brendan Donegan ]
74
75 * Changed python3 to python3-all in Build-Depends.

Subscribers

People subscribed via source and target branches