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

[Po-Hsu Lin]

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.

[Zygmunt Krynicki (zyga)]

Looks good to me, thank you

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

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

[Brendan Donegan (brendan-donegan)]

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

=== modified file 'bin/checkbox-certification-client'
--- bin/checkbox-certification-client	2012-06-05 16:39:06 +0000
+++ bin/checkbox-certification-client	2014-02-05 07:23:40 +0000
@@ -8,7 +8,7 @@
 export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox}
 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-/usr/share/checkbox}
 export CHECKBOX_CERTIFICATION_SHARE=${CHECKBOX_CERTIFICATION_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_CERTIFICATION_SHARE/data/client-selftest.whitelist $OPTIONS}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_SHARE/data/whitelists/client-selftest.whitelist $OPTIONS}
 
 # Convenience for defining the PYTHONPATH directory.
 if [ "$CHECKBOX_SHARE" != "/usr/share/checkbox" ]; then
 
=== modified file 'bin/checkbox-certification-prepare'
--- bin/checkbox-certification-prepare	2013-11-15 03:33:08 +0000
+++ bin/checkbox-certification-prepare	2014-02-05 07:23:40 +0000
@@ -29,7 +29,7 @@
 cat >~/run-checkbox.sh <<EOF
 checkbox-certification-client \
 --config="checkbox-certification/plugins/submission_info/tags=$TAGS" \
--W /usr/share/checkbox-certification/data/client-cert.whitelist \
+-W /usr/share/checkbox/data/whitelists/client-cert.whitelist \
 --config="checkbox/plugins/launchpad_prompt/email=[e-mail]" \
 --config="checkbox/plugins/blacklist=" \
 --log-level=debug
@@ -55,7 +55,7 @@
 cat << EOF2 > ~/actually-run-checkbox-stress.sh
 checkbox-certification-client \
     --config=\""checkbox-certification/plugins/submission_info/tags=$TAGS\"" \
-    -W /usr/share/checkbox-certification/data/client-stress.whitelist \
+    -W /usr/share/checkbox/data/whitelists/client-stress.whitelist \
     --config="checkbox/plugins/launchpad_prompt/email=[e-mail]" \
     --config="checkbox/plugins/blacklist=" \
     --config="checkbox-certification/plugins/submission_info/secure_id=$submission_id"
 
=== modified file 'bin/checkbox-certification-server'
--- bin/checkbox-certification-server	2012-06-05 16:39:06 +0000
+++ bin/checkbox-certification-server	2014-02-05 07:23:40 +0000
@@ -8,7 +8,7 @@
 export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox}
 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-/usr/share/checkbox}
 export CHECKBOX_CERTIFICATION_SHARE=${CHECKBOX_CERTIFICATION_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_CERTIFICATION_SHARE/data/server-selftest.whitelist $OPTIONS}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_SHARE/data/whitelists/server-selftest.whitelist $OPTIONS}
 
 # Convenience for defining the PYTHONPATH directory.
 if [ "$CHECKBOX_SHARE" != "/usr/share/checkbox" ]; then
 
=== modified file 'bin/checkbox-certification-server-soc'
--- bin/checkbox-certification-server-soc	2013-10-04 11:13:51 +0000
+++ bin/checkbox-certification-server-soc	2014-02-05 07:23:40 +0000
@@ -8,7 +8,7 @@
 export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox}
 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-/usr/share/checkbox}
 export CHECKBOX_CERTIFICATION_SHARE=${CHECKBOX_CERTIFICATION_SHARE:-.}
-export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_CERTIFICATION_SHARE/data/server-soc-selftest.whitelist $OPTIONS}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---log=$CHECKBOX_DATA/checkbox-certification.log --whitelist-file=$CHECKBOX_SHARE/data/whitelists/server-soc-selftest.whitelist $OPTIONS}
 
 # Convenience for defining the PYTHONPATH directory.
 if [ "$CHECKBOX_SHARE" != "/usr/share/checkbox" ]; then
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-02-03 14:27:24 +0000
+++ debian/changelog	2014-02-05 07:23:40 +0000
@@ -1,5 +1,10 @@
 checkbox-certification (0.19) UNRELEASED; urgency=low
 
+  [ Po-Hsu Lin ]
+  * Change the whitelist location of checkbox-certification-prepare,
+    checkbox-certification-server-soc, checkbox-certification-server 
+    and checkbox-certification-client to Checkbox.
+
   [ Brendan Donegan ]
 
   * Changed python3 to python3-all in Build-Depends.