|
@@ -36,6 +36,7 @@ import re
|
|
|
import fnmatch
|
|
|
import collections
|
|
|
import imp
|
|
|
+import git
|
|
|
|
|
|
sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)) + '/lib')
|
|
|
import scriptpath
|
|
@@ -46,6 +47,7 @@ import argparse_oe
|
|
|
import oeqa.selftest
|
|
|
import oeqa.utils.ftools as ftools
|
|
|
from oeqa.utils.commands import runCmd, get_bb_var, get_test_layer
|
|
|
+from oeqa.utils.metadata import metadata_from_bb, write_metadata_file
|
|
|
from oeqa.selftest.base import oeSelfTest, get_available_machines
|
|
|
|
|
|
try:
|
|
@@ -106,6 +108,8 @@ def get_args_parser():
|
|
|
help='List all tags that have been set to test cases.')
|
|
|
parser.add_argument('--machine', required=False, dest='machine', choices=['random', 'all'], default=None,
|
|
|
help='Run tests on different machines (random/all).')
|
|
|
+ parser.add_argument('--repository', required=False, dest='repository', default='', action='store',
|
|
|
+ help='Submit test results to a repository')
|
|
|
return parser
|
|
|
|
|
|
|
|
@@ -572,6 +576,75 @@ def main():
|
|
|
|
|
|
log.info("Finished")
|
|
|
|
|
|
+ if args.repository:
|
|
|
+ # Commit tests results to repository
|
|
|
+ metadata = metadata_from_bb()
|
|
|
+ git_dir = os.path.join(os.getcwd(), 'selftest')
|
|
|
+ if not os.path.isdir(git_dir):
|
|
|
+ os.mkdir(git_dir)
|
|
|
+
|
|
|
+ log.debug('Checking for git repository in %s' % git_dir)
|
|
|
+ try:
|
|
|
+ repo = git.Repo(git_dir)
|
|
|
+ except git.exc.InvalidGitRepositoryError:
|
|
|
+ log.debug("Couldn't find git repository %s; "
|
|
|
+ "cloning from %s" % (git_dir, args.repository))
|
|
|
+ repo = git.Repo.clone_from(args.repository, git_dir)
|
|
|
+
|
|
|
+ r_branches = repo.git.branch(r=True)
|
|
|
+ r_branches = set(r_branches.replace('origin/', '').split())
|
|
|
+ l_branches = {str(branch) for branch in repo.branches}
|
|
|
+ branch = '%s/%s/%s' % (metadata['hostname'],
|
|
|
+ metadata['layers']['meta']['branch'],
|
|
|
+ metadata['machine'])
|
|
|
+
|
|
|
+ if branch in l_branches:
|
|
|
+ log.debug('Found branch in local repository, checking out')
|
|
|
+ repo.git.checkout(branch)
|
|
|
+ elif branch in r_branches:
|
|
|
+ log.debug('Found branch in remote repository, checking'
|
|
|
+ ' out and pulling')
|
|
|
+ repo.git.checkout(branch)
|
|
|
+ repo.git.pull()
|
|
|
+ else:
|
|
|
+ log.debug('New branch %s' % branch)
|
|
|
+ repo.git.checkout('master')
|
|
|
+ repo.git.checkout(b=branch)
|
|
|
+
|
|
|
+ cleanResultsDir(repo)
|
|
|
+ xml_dir = os.path.join(os.getcwd(), log_prefix)
|
|
|
+ copyResultFiles(xml_dir, git_dir, repo)
|
|
|
+ metadata_file = os.path.join(git_dir, 'metadata.xml')
|
|
|
+ write_metadata_file(metadata_file, metadata)
|
|
|
+ repo.index.add([metadata_file])
|
|
|
+ repo.index.write()
|
|
|
+
|
|
|
+ # Get information for commit message
|
|
|
+ layer_info = ''
|
|
|
+ for layer, values in metadata['layers'].items():
|
|
|
+ layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer,
|
|
|
+ values['branch'], values['revision'])
|
|
|
+ msg = 'Selftest for build %s of %s %s for machine %s on %s\n\n%s' % (
|
|
|
+ log_prefix[12:], metadata['distro'], metadata['distro_version'],
|
|
|
+ metadata['machine'], metadata['hostname'], layer_info)
|
|
|
+
|
|
|
+ log.debug('Commiting results to local repository')
|
|
|
+ repo.index.commit(msg)
|
|
|
+ if not repo.is_dirty():
|
|
|
+ try:
|
|
|
+ if branch in r_branches:
|
|
|
+ log.debug('Pushing changes to remote repository')
|
|
|
+ repo.git.push()
|
|
|
+ else:
|
|
|
+ log.debug('Pushing changes to remote repository '
|
|
|
+ 'creating new branch')
|
|
|
+ repo.git.push('-u', 'origin', branch)
|
|
|
+ except GitCommandError:
|
|
|
+ log.error('Falied to push to remote repository')
|
|
|
+ return 1
|
|
|
+ else:
|
|
|
+ log.error('Local repository is dirty, not pushing commits')
|
|
|
+
|
|
|
if result.wasSuccessful():
|
|
|
return 0
|
|
|
else:
|
|
@@ -655,6 +728,35 @@ def buildResultClass(args):
|
|
|
|
|
|
return StampedResult
|
|
|
|
|
|
+def cleanResultsDir(repo):
|
|
|
+ """ Remove result files from directory """
|
|
|
+
|
|
|
+ xml_files = []
|
|
|
+ directory = repo.working_tree_dir
|
|
|
+ for f in os.listdir(directory):
|
|
|
+ path = os.path.join(directory, f)
|
|
|
+ if os.path.isfile(path) and path.endswith('.xml'):
|
|
|
+ xml_files.append(f)
|
|
|
+ repo.index.remove(xml_files, working_tree=True)
|
|
|
+
|
|
|
+def copyResultFiles(src, dst, repo):
|
|
|
+ """ Copy result files from src to dst removing the time stamp. """
|
|
|
+
|
|
|
+ import shutil
|
|
|
+
|
|
|
+ re_time = re.compile("-[0-9]+")
|
|
|
+ file_list = []
|
|
|
+
|
|
|
+ for root, subdirs, files in os.walk(src):
|
|
|
+ tmp_dir = root.replace(src, '').lstrip('/')
|
|
|
+ for s in subdirs:
|
|
|
+ os.mkdir(os.path.join(dst, tmp_dir, s))
|
|
|
+ for f in files:
|
|
|
+ file_name = os.path.join(dst, tmp_dir, re_time.sub("", f))
|
|
|
+ shutil.copy2(os.path.join(root, f), file_name)
|
|
|
+ file_list.append(file_name)
|
|
|
+ repo.index.add(file_list)
|
|
|
+
|
|
|
class TestRunner(_TestRunner):
|
|
|
"""Test runner class aware of exporting tests."""
|
|
|
def __init__(self, *args, **kwargs):
|