Merge lp:~smoser/vmbuilder/jenkins_kvm.img-maas-git into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Scott Moser]

img-maas.tmpl: Install git if it is not present.

img-maas.tmpl uses git to check out maas-images. That does not work
if there is no 'git' command. 14.04 images do not have git by default.

[Scott Moser (smoser)]

Francis's https://code.launchpad.net/~fginther/vmbuilder/jenkins_kvm-add-git-for-maas/+merge/357844
seems more correct.

review: Disapprove

Unmerged revisions

813. By Scott Moser on 2018-10-25

img-maas.tmpl: Install git if it is not present.

img-maas.tmpl uses git to check out maas-images. That does not work
if there is no 'git' command. 14.04 images do not have git by default.

=== modified file 'templates/img-maas.tmpl'
--- templates/img-maas.tmpl	2018-09-24 20:22:02 +0000
+++ templates/img-maas.tmpl	2018-10-25 19:02:25 +0000
@@ -38,6 +38,12 @@
 
 # Set up the code paths
 cd /tmp
+if ! which git; then
+    echo "Installing git."
+    sudo apt-get update --quiet &&
+        sudo apt-get install --quiet --assume-yes git ||
+        fail "Failed to install git with apt-get."
+fi
 echo "Checking out maas-image from git"
 git clone "${MAAS_GIT_REPO}" "${SRC_D}" ||
     fail "Failed to check out the GIT branch"