Merge lp:~fginther/vmbuilder/jenkins_kvm-add-git-for-maas into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

Proposed by Francis Ginther
Status: Merged
Merged at revision: 813
Proposed branch: lp:~fginther/vmbuilder/jenkins_kvm-add-git-for-maas
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 67 lines (+11/-2)
5 files modified
config/cloud-maasv2.cfg (+1/-0)
config/cloud-maasv3.cfg (+1/-0)
config/cloud-trusty-pp64el.cfg (+1/-0)
templates/img-maasv2.tmpl (+4/-1)
templates/img-maasv3.tmpl (+4/-1)
To merge this branch: bzr merge lp:~fginther/vmbuilder/jenkins_kvm-add-git-for-maas
Reviewer Review Type Date Requested Status
Philip Roche Approve
Robert C Jennings (community) Approve
Review via email: mp+357844@code.launchpad.net

Commit message

Add 'git' to the build environment for maas images

The maas branches have moved from bzr to git and we therefore need
git to be available.

Description of the change

I've tested this in the maasv2 jobs here: https://cloud-images-jenkins.canonical.com/job/MAAS_v2_MasterBuilder/1391/

Note the use of the http.proxy. It's needed for the ppc64el builds, but it causes the other arches to fail. I chose to use the proxy method first as it will fail quickly and then retry without it. Otherwise, git will wait for 2 minutes before timing out the non-proxy method.

To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

+1

review: Approve
Revision history for this message
Philip Roche (philroche) wrote :

+1 on the fallback approach too

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config/cloud-maasv2.cfg'
--- config/cloud-maasv2.cfg 2015-08-31 19:06:51 +0000
+++ config/cloud-maasv2.cfg 2018-10-25 21:56:02 +0000
@@ -4,6 +4,7 @@
4password: ubuntu4password: ubuntu
5packages:5packages:
6- bzr6- bzr
7- git
7- qemu-utils8- qemu-utils
8- zerofree9- zerofree
9- gdisk10- gdisk
1011
=== modified file 'config/cloud-maasv3.cfg'
--- config/cloud-maasv3.cfg 2016-10-03 20:23:12 +0000
+++ config/cloud-maasv3.cfg 2018-10-25 21:56:02 +0000
@@ -4,6 +4,7 @@
4password: ubuntu4password: ubuntu
5packages:5packages:
6- bzr6- bzr
7- git
7- qemu-utils8- qemu-utils
8- zerofree9- zerofree
9- gdisk10- gdisk
1011
=== modified file 'config/cloud-trusty-pp64el.cfg'
--- config/cloud-trusty-pp64el.cfg 2015-04-03 14:37:41 +0000
+++ config/cloud-trusty-pp64el.cfg 2018-10-25 21:56:02 +0000
@@ -1,6 +1,7 @@
1#cloud-config1#cloud-config
2packages:2packages:
3- bzr3- bzr
4- git
4- debootstrap5- debootstrap
5- kpartx6- kpartx
6- debhelper7- debhelper
78
=== modified file 'templates/img-maasv2.tmpl'
--- templates/img-maasv2.tmpl 2018-09-24 20:22:02 +0000
+++ templates/img-maasv2.tmpl 2018-10-25 21:56:02 +0000
@@ -44,7 +44,10 @@
44# Set up the code paths44# Set up the code paths
45cd /tmp45cd /tmp
46echo "Checking out maas-image from git"46echo "Checking out maas-image from git"
47git clone "${MAAS_GIT_REPO}" "${SRC_D}" ||47# Try the proxy method first, then fallback to using no proxy
48# Either way will work, but this will failover faster
49git clone --config "http.proxy=squid.internal:3128" "${MAAS_GIT_REPO}" "${SRC_D}" ||
50 git clone "${MAAS_GIT_REPO}" "${SRC_D}" ||
48 fail "Failed to check out the GIT branch"51 fail "Failed to check out the GIT branch"
4952
50# Assume we are MAAS v153# Assume we are MAAS v1
5154
=== modified file 'templates/img-maasv3.tmpl'
--- templates/img-maasv3.tmpl 2018-09-24 20:22:02 +0000
+++ templates/img-maasv3.tmpl 2018-10-25 21:56:02 +0000
@@ -40,7 +40,10 @@
40# Set up the code paths40# Set up the code paths
41cd /tmp41cd /tmp
42echo "Checking out maas-image from git"42echo "Checking out maas-image from git"
43git clone "${MAAS_GIT_REPO}" "${SRC_D}" ||43# Try the proxy method first, then fallback to using no proxy
44# Either way will work, but this will failover faster
45git clone --config "http.proxy=squid.internal:3128" "${MAAS_GIT_REPO}" "${SRC_D}" ||
46 git clone "${MAAS_GIT_REPO}" "${SRC_D}" ||
44 fail "Failed to check out the GIT branch"47 fail "Failed to check out the GIT branch"
4548
46bash -x "${SRC_D}/system-setup";49bash -x "${SRC_D}/system-setup";

Subscribers

People subscribed via source and target branches