Merge ~gary-wzl77/snappy-hwe-snaps/+git/jenkins-jobs:key_path into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Gary.Wang]

Fix the ci bot key path.

The ci bot key is placed in one specific folder, not the default
and global one. We need to declare the exact key path in GIT_SSH_COMMAND
variable to avoid 'No such file or directory' error.

Fix the ci bot key path.

The ci bot key is placed in one specific folder, not the default
and global one. We need to declare the exact key path in GIT_SSH_COMMAND
variable to avoid 'No such file or directory' error.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:2e18c580e524392c468d4040b4a09b8699929c80
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/122/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/172
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/172
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/172
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/172
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/967
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/714
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/735/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/122/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/jobs/snap/snap-test.sh b/jobs/snap/snap-test.sh
index 97c7697..8b679f9 100644
--- a/jobs/snap/snap-test.sh
+++ b/jobs/snap/snap-test.sh
@@ -29,7 +29,8 @@ if [ "$RUN_TESTS" = False ]; then
 fi
 
 SSH_PATH="${JENKINS_HOME}/.ssh/"
-SSH_KEY_PATH="${SSH_PATH}/git.launchpad.net/system-enablement-ci-bot"
+CI_BOT_KEY_PATH="git.launchpad.net/system-enablement-ci-bot"
+SSH_KEY_PATH="${SSH_PATH}/${CI_BOT_KEY_PATH}"
 
 SSH="ssh -i $SSH_KEY_PATH/id_rsa $REMOTE_USER@$REMOTE_WORKER"
 SCP="scp -i $SSH_KEY_PATH/id_rsa"
@@ -83,7 +84,7 @@ go build github.com/snapcore/spread/cmd/spread
 mkdir /build/bin
 cp spread /build/bin
 
-GIT_SSH_COMMAND='ssh -i /root/.ssh/id_rsa' git clone --depth 1 -b $CI_BRANCH git+ssh://$[e-mail]/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/$CI_REPO /build/src
+GIT_SSH_COMMAND='ssh -i /root/.ssh/$CI_BOT_KEY_PATH/id_rsa' git clone --depth 1 -b $CI_BRANCH git+ssh://$[e-mail]/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/$CI_REPO /build/src
 cd /build/src
 
 # Copy any stage results from previous generic-build-snap-worker builds