Merge lp:~dobey/pay-service/fix-staging into lp:pay-service

[dobey]

Fix typo in setup-staging.sh.
Also include remounting / in setup-staging.sh to enable writable for key.

[lp:~dobey/pay-service/fix-staging]

91. By dobey on 2016-01-12

Don't remount ro, to avoid ro for people who use writable-image.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/pay-service-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-wily-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/75/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/145/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'tests/setup-staging.sh'
--- tests/setup-staging.sh	2015-10-20 20:18:25 +0000
+++ tests/setup-staging.sh	2016-01-12 15:23:50 +0000
@@ -45,10 +45,11 @@
 STAGING_POLICY_PATH=/etc/debsig/policies/${STAGING_KEY_ID}
 
 PROD_KEY_ID=608FF2D200A0A71F
-PROD_POLCIY_PATH=/etc/debsig/policies/${PROD_KEY_ID}
+PROD_POLICY_PATH=/etc/debsig/policies/${PROD_KEY_ID}
 
-if [ ! -d ${STAGING_KEYRING_PATH} ]; then
+if [ ! -d ${STAGING_KEYRING_PATH} -o ! -d ${STAGING_POLICY_PATH} ]; then
     echo "Setting up staging GPG key"
+    sudo mount -o remount,rw /
     sudo mkdir -p ${STAGING_KEYRING_PATH}
     sudo gpg --no-default-keyring \
         --keyring ${STAGING_KEYRING_PATH}/click-store.gpg \