Merge lp:~allenap/maas/offline-more into lp:~maas-committers/maas/trunk

[Gavin Panella]

make offline=true <target> now keeps buildout and virtualenv off the network for all targets.

Previously there was a build-offline target that permitted an offline build only. This is a more general solution.

[Diogo Matsubara (matsubara)]

Looks good!

review: Approve

[John A Meinel (jameinel)]

It seems a little funny that the way it is defined you can do:
make offline=False

And it will build offline. However, I don't care a ton about that.

It seems more like something that you would want to set up per-site rather than something you have to think about passing to make. However, it is certainly better than not having it at all.

I wonder about doing:

buildout := bin/buildout buildout:offline=$(offline)

review: Approve

[Gavin Panella (allenap)]

> make offline=False

Yeah, that is a bit of a wart :-/

> buildout := bin/buildout buildout:offline=$(offline)

We'd still need to do something about virtualenv, but that seems okay, assuming buildout will cope with the empty string there.

In the fullness of time I'd like to remove buildout and settle with just one virtualenv. buildout has sucked away so much time compared to the benefits it brings. It tries to do too much but has more edge cases than monoclinic sulphur.

[John A Meinel (jameinel)]

I would tend to agree that buildout doesn't work quite as well as advertised in real situations.

=== modified file 'Makefile'
--- Makefile	2012-09-21 14:58:20 +0000
+++ Makefile	2012-09-24 16:15:25 +0000
@@ -1,6 +1,14 @@
 python := python2.7
+
+# Network activity can be suppressed by setting offline=true (or any
+# non-empty string) at the command-line.
+ifeq ($(offline),)
 buildout := bin/buildout
 virtualenv := virtualenv
+else
+buildout := bin/buildout buildout:offline=true
+virtualenv := virtualenv --never-download
+endif
 
 # Python enum modules.
 py_enums := $(wildcard src/*/enum.py)
@@ -27,13 +35,6 @@
     bin/py bin/ipy \
     $(js_enums)
 
-# Note: the following target may not be needed. It remains as an
-# experiment, to see if it helps the situation with building MAAS in
-# the QA environment, which is isolated from the Internet at large.
-build-offline: buildout := $(buildout) buildout:offline=true
-build-offline: virtualenv := $(virtualenv) --never-download
-build-offline: build
-
 all: build doc
 
 # Install all packages required for MAAS development & operation on
@@ -170,7 +171,6 @@
 
 define phony_targets
   build
-  build-offline
   check
   clean
   dbharness