Merge lp://qastaging/~fginther/vmbuilder/jenkins_kvm-add-git-for-maas into lp://qastaging/~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Proposed by
Francis Ginther
| Status: | Merged |
|---|---|
| Merged at revision: | 813 |
| Proposed branch: | lp://qastaging/~fginther/vmbuilder/jenkins_kvm-add-git-for-maas |
| Merge into: | lp://qastaging/~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://qastaging/~fginther/vmbuilder/jenkins_kvm-add-git-for-maas |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Philip Roche | Approve | ||
| Robert C Jennings (community) | Approve | ||
|
Review via email:
|
|||
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:/
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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1