diff options
Diffstat (limited to 'test_trove_upgrades.py')
| -rw-r--r-- | test_trove_upgrades.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/test_trove_upgrades.py b/test_trove_upgrades.py index f7f3bce..a3fbcdb 100644 --- a/test_trove_upgrades.py +++ b/test_trove_upgrades.py @@ -239,6 +239,11 @@ class TroveUpgrade(Deployment): super(TroveUpgrade, self).__init__( 'trove-system-x86_64', 'trove-test-upgrade', systembranch) + # Temporary hack until Pedro's branch is merged. + systembranch.set_chunk_version( + 'trove-system-x86_64', 'foundation', 'tbdiff', + ref='baserock/pedroalvarez/system-version-manager4') + def run_deploy(self, autostart=False): autostart_param = \ '%s.AUTOSTART=%s' % (self.name, 'yes' if autostart else 'no') @@ -312,7 +317,7 @@ class SystemTestBranch(object): self.workspace_dir = workspace_dir self.branch_dir = os.path.join(workspace_dir, name) self.morphs_dir = os.path.join( - self.branch_dir, 'baserock:baserock', 'morphs') + self.branch_dir, 'baserock:baserock', 'definitions') def get_repo_and_ref_for_chunk(self, stratum, chunk): stratum_morph_file = os.path.join( @@ -338,12 +343,12 @@ class SystemTestBranch(object): object_name = original_ref + ':' + chunk_morph_name with open(chunk_morph_name, 'w') as f: run_git(['cat-file', 'blob', object_name], stdout=f) - message = 'Add lighttpd.morph from branch %s' % config.BRANCH + message = 'Add chunk from branch %s' % config.BRANCH run_git(['add', chunk_morph_name]) run_git(['commit', '-m', message]) def set_chunk_version(self, system, stratum, chunk, - tag='baserock/morph'): + ref='baserock/morph'): ''' Force a specific version of a chunk to be built in a system self. @@ -360,7 +365,7 @@ class SystemTestBranch(object): plugin = morphlib.plugins.branch_and_merge_plugin.BranchAndMergePlugin chunk_dir = os.path.join( self.branch_dir, plugin.convert_uri_to_path(chunk_repo_uri)) - run_git(['reset', '--hard', tag], cwd=chunk_dir) + run_git(['reset', '--hard', ref], cwd=chunk_dir) self._copy_chunk_morph_if_missing(chunk_dir, chunk, original_ref) @@ -450,7 +455,7 @@ class BaseTestSuite(object): def create_system_branch(self, workspace_dir, name, parent=config.BRANCH): run_morph( - ['branch', 'baserock:baserock/morphs', name, parent], + ['branch', 'baserock:baserock/definitions', name, parent], cwd=workspace_dir) return SystemTestBranch(workspace_dir, name) @@ -510,7 +515,7 @@ class TestUpgrades(BaseTestSuite): branch = self.create_system_branch(fixture_dir, 'old') branch.set_chunk_version( system='trove-system-x86_64', stratum='trove', - chunk='lighttpd', tag='lighttpd-1.3.14') + chunk='lighttpd', ref='lighttpd-1.3.14') instance = TroveInitialDeployment(branch) instance.create_config() @@ -605,7 +610,7 @@ class TestUpgrades(BaseTestSuite): branch = self.create_system_branch(fixture_dir, 'old') branch.set_chunk_version( system='trove-system-x86_64', stratum='bsp-x86_64-generic', - chunk='linux', tag='v3.6') + chunk='linux', ref='v3.6') instance = TroveInitialDeployment(branch) instance.create_config() |