Merge ~juliank/autopkgtest-cloud:fix-clone-location into autopkgtest-cloud:master

[Julian Andres Klode]

[Steve Langasek (vorlon)]

LGTM :)

review: Approve

diff --git a/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/install b/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/install
index 470fce9..93b339b 100755
--- a/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/install
+++ b/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/install
@@ -20,7 +20,7 @@ else
 fi
 
 if [ ! -d autopkgtest ]; then
-    git clone https://git.launchpad.net/~ubuntu-release/autopkgtest/+git/development
+    git clone https://git.launchpad.net/~ubuntu-release/autopkgtest/+git/development autopkgtest
 else
     (cd autopkgtest; git pull)
 fi
diff --git a/tools/armhf-lxd-slave.userdata b/tools/armhf-lxd-slave.userdata
index 36c4dea..7cbe974 100644
--- a/tools/armhf-lxd-slave.userdata
+++ b/tools/armhf-lxd-slave.userdata
@@ -135,6 +135,6 @@ runcmd:
 
  - apt-get install -y --no-install-recommends git
  - adduser ubuntu lxd
- - su - -c '[ -e autopkgtest ] || git clone https://git.launchpad.net/~ubuntu-release/autopkgtest/+git/development' ubuntu
+ - su - -c '[ -e autopkgtest ] || git clone https://git.launchpad.net/~ubuntu-release/autopkgtest/+git/development autopkgtest' ubuntu
  - su - -c 'cat /var/tmp/setup/ubuntu-crontab | crontab -' ubuntu
  - sh -xe /var/tmp/setup/post-boot-setup.sh &