summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2015-09-11 10:03:54 +0100
committerMichael Drake <michael.drake@codethink.co.uk>2015-09-11 10:03:54 +0100
commitde7f51137cd7417048713dcd6615bdb9ee870eeb (patch)
tree019de04f1d89d6c4fe25e1416172152d55059733
parent0a1587115a7d4b41a6b1bcda7bce2d6e205b2155 (diff)
downloadciat-tester-de7f51137cd7417048713dcd6615bdb9ee870eeb.tar.gz
Remove baserock build test.
-rwxr-xr-xopenstack/tester52
1 files changed, 9 insertions, 43 deletions
diff --git a/openstack/tester b/openstack/tester
index 00699ca..4c3932a 100755
--- a/openstack/tester
+++ b/openstack/tester
@@ -416,53 +416,19 @@ class ReleaseApp(cliapp.Application):
instance.wait_until_online()
tests = []
- def baserock_build_test(instance):
- instance.runcmd(['git', 'config', '--global', 'user.name',
- 'Test Instance of %s' % instance.deployment.name])
- instance.runcmd(['git', 'config', '--global', 'user.email',
- 'ci-test@%s' % instance.config['HOSTNAME']])
- instance.runcmd(['mkdir', '-p', '/src/ws', '/src/cache',
- '/src/tmp'])
- def morph_cmd(*args, **kwargs):
- # TODO: decide whether to use cached artifacts or not by
- # adding --artifact-cache-server= --cache-server=
- argv = ['morph', '--log=/src/morph.log', '--cachedir=/src/cache',
- '--tempdir=/src/tmp', '--log-max=100M',
- '--trove-host', trove_host, '--trove-id', trove_id,
- '--build-ref-prefix', build_ref_prefix]
- argv.extend(args)
- instance.runcmd(argv, **kwargs)
-
- repo = morph_helper.sb.root_repository_url
- ref = morph_helper.defs_repo.HEAD
- sha1 = morph_helper.defs_repo.resolve_ref_to_commit(ref)
- morph_cmd('init', '/src/ws')
- chdir = '/src/ws'
-
- morph_cmd('checkout', repo, ref, chdir=chdir)
- # TODO: Add a morph subcommand that gives the path to the root repository.
- repo_path = os.path.relpath(
- morph_helper.sb.get_git_directory_name(repo),
- morph_helper.sb.root_directory)
- chdir = os.path.join(chdir, ref, repo_path)
-
- instance.runcmd(['git', 'reset', '--hard', sha1], chdir=chdir)
- print 'Building test systems for {sys}'.format(sys=system_path)
- for to_build_path, to_build_morph in systems.iteritems():
- if to_build_morph['arch'] == system_morph['arch']:
- print 'Test building {path}'.format(path=to_build_path)
- morph_cmd('build', to_build_path, chdir=chdir,
- stdin=None, stdout=None, stderr=None)
- print 'Finished Building test systems'
+
+ def uname_test(instance):
+ print('# uname test');
+ instance.runcmd(['uname', '-a'], stdout=self.output)
def python_smoke_test(instance):
- instance.runcmd(['python', '-c', 'print "Hello World"'])
+ print('# python test')
+ instance.runcmd(['python', '-c', 'print "Hello World"'],
+ stdout=self.output)
# TODO: Come up with a better way of determining which tests to run
- if 'devel' in system_path:
- tests.append(baserock_build_test)
- else:
- tests.append(python_smoke_test)
+ tests.append(uname_test)
+ tests.append(python_smoke_test)
for test in tests:
test(instance)