Refactor build process

Reorganise the build_artifact() and build_artifacts() functions to
allow more complex work when setting up chunk builds in
build_artifact().

The staging area now holds the BuildEnvironment object (the
environment variables that should be set during build). This makes sense
because all build commands should be run inside the staging area and
therefore through the StagingArea object.

The BuildEnvironment object is now considered immutable after it is
created.  The environment is used in cache key computation when
computing what artifacts are required; if it changes after that point
we risk either computing different artifact keys for the same artifact
or missing data in the cache key that should be included in the hash.
Better to force changes into a separate 'extra_env' variable.

1 files changed, 4 insertions, 5 deletions

diff --git a/morphlib/builder2_tests.py b/morphlib/builder2_tests.py
index df07a59f..c0da3cd9 100644
--- a/morphlib/builder2_tests.py
+++ b/morphlib/builder2_tests.py
@@ -35,8 +35,9 @@ class FakeApp(object):
 
 class FakeStagingArea(object):
 
-    def __init__(self, runcmd):
+    def __init__(self, runcmd, build_env):
         self.runcmd = runcmd
+        self.env = build_env.env
 
 
 class FakeSource(object):
@@ -146,7 +147,7 @@ class BuilderBaseTests(unittest.TestCase):
     def setUp(self):
         self.commands_run = []
         self.app = FakeApp(self.fake_runcmd)
-        self.staging_area = FakeStagingArea(self.fake_runcmd)
+        self.staging_area = FakeStagingArea(self.fake_runcmd, FakeBuildEnv())
         self.artifact_cache = FakeArtifactCache()
         self.artifact = FakeArtifact('le-artifact')
         self.repo_cache = None
@@ -158,7 +159,6 @@ class BuilderBaseTests(unittest.TestCase):
                                                      None,
                                                      self.artifact,
                                                      self.repo_cache,
-                                                     self.build_env,
                                                      self.max_jobs,
                                                      False)
 
@@ -252,8 +252,7 @@ class ChunkBuilderTests(unittest.TestCase):
     def setUp(self):
         self.app = FakeApp()
         self.build = morphlib.builder2.ChunkBuilder(self.app, None, None,
-                                                    None, None, None, None, 1,
-                                                    False)
+                                                    None, None, None, 1, False)
 
     def test_uses_morphology_commands_when_given(self):
         m = {'build-commands': ['build-it']}