diff options
| -rw-r--r-- | mason/tests/build_test.py | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/mason/tests/build_test.py b/mason/tests/build_test.py index a50eef7..c2ae566 100644 --- a/mason/tests/build_test.py +++ b/mason/tests/build_test.py @@ -83,9 +83,16 @@ class Runner(mason.runners.JobRunner): argv.extend(args) instance.runcmd(argv, **kwargs) - repo = self.morph_helper.sb.root_repository_url - ref = self.morph_helper.defs_repo.HEAD - sha1 = self.morph_helper.defs_repo.resolve_ref_to_commit(ref) + # The repo Mason build and deployed this system from is only + # available on the system as /var/lib/ + + #repo = self.morph_helper.sb.root_repository_url + #ref = self.morph_helper.defs_repo.HEAD + #sha1 = self.morph_helper.defs_repo.resolve_ref_to_commit(ref) + + repo = 'baserock:baserock/definitions' + ref = 'master' + morph_cmd('init', '/src/ws', stdin=None, stdout=logfile, stderr=logfile) chdir = '/src/ws' @@ -93,12 +100,14 @@ class Runner(mason.runners.JobRunner): morph_cmd('checkout', repo, ref, chdir=chdir, stdin=None, stdout=logfile, stderr=logfile) # TODO: Add a morph subcommand that gives the path to the root repository. - repo_path = os.path.relpath( - self.morph_helper.sb.get_git_directory_name(repo), - self.morph_helper.sb.root_directory) - chdir = os.path.join(chdir, ref, repo_path) - - instance.runcmd(['git', 'reset', '--hard', sha1], chdir=chdir, + #repo_path = os.path.relpath( + # self.morph_helper.sb.get_git_directory_name(repo), + # self.morph_helper.sb.root_directory) + #chdir = os.path.join(chdir, ref, repo_path) + chdir = os.path.join(chdir, ref, 'baserock', 'baserock', + 'definitions') + + instance.runcmd(['git', 'reset', '--hard', 'HEAD'], chdir=chdir, stdin=None, stdout=logfile, stderr=logfile) logfile.write('Building test systems for %s\n' % system_path) for to_build_path, to_build_morph in systems.iteritems(): |