fix the thing to take the morph from the system branch

1 files changed, 10 insertions, 1 deletions

diff --git a/test_trove_upgrades.py b/test_trove_upgrades.py
index 5a2e35e..c59e774 100644
--- a/test_trove_upgrades.py
+++ b/test_trove_upgrades.py
@@ -62,7 +62,7 @@ import yaml
 # The test host must have passwordless access to this machine. The tests set
 # set StrictHostKeyChecking=no for SSH connections so it does not need to be in
 # '~/.ssh/known_hosts'.
-DEPLOY_URL = 'kvm+ssh://richardipsum@10.24.1.211'
+DEPLOY_URL = 'kvm+ssh://richardipsum@10.24.1.211/'
 DEPLOY_PATH = '/home/richardipsum/Desktop/vm/ct-ri-test.img'
 
 # Seconds to wait for machine to appear on network before assuming it didn't
@@ -474,11 +474,20 @@ class TestUpgrades(BaseTestSuite):
         run_git(['commit', '-m', 'Edit lighttpd chunk'], cwd=branch.morphs_dir)
 
         chunk_dir = os.path.join(branch.branch_dir, 'upstream:lighttpd')
+
         # Set the system branch's corresponding Git branch in the chunk repo
         # to the specific ref. This chunk doesn't have a chunk morphology so
         # there's no further work to do!
         run_git(['reset', '--hard', tag], cwd=chunk_dir)
 
+        build_morph_name = 'lighttpd.morph'
+        build_morph = run_git(['cat-file', 'blob', BRANCH + ':' + build_morph_name])
+
+        with open(os.path.join(chunk_dir, build_morph_name)) as f:
+            f.write(build_morph)
+
+        run_git(['commit', '-m', 'Add lighttpd.morph'], cwd=branch.morphs_dir)
+
     @contextlib.contextmanager
     def given_out_of_date_trove_instance(self, vm_name, fixture_dir, reuse=False):
         '''