From 47187c6cfa2502e147f4fde355aa5bbee7a9f94d Mon Sep 17 00:00:00 2001 From: hyokeun Date: Thu, 27 Apr 2017 16:42:50 +0900 Subject: [PATCH] Fix of mic log copy Change-Id: Id29fdc49b2f8b6af0fd2b72a742fae9bfa2d103c --- job_imager.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/job_imager.py b/job_imager.py index 99647b8..5c3628b 100755 --- a/job_imager.py +++ b/job_imager.py @@ -272,7 +272,7 @@ def main(): # workaround for qemu/9p bug in mapping permissions set_permissions(outdir, (0644, 0755)) else: - log = os.path.join(outdir, '%s_%s.log.txt' % (build_id, name)) + log = os.path.join(outdir, '%s_%s.log' % (build_id, name)) cache = os.path.join(basedir, 'cache') if not os.path.exists(cache): os.makedirs(cache) @@ -289,12 +289,6 @@ def main(): os.system('sudo chmod 0777 -R %s' % basedir) - try: - # Copy logfile to sync directory - shutil.copy(log, os.path.join(outdir, build_id, 'images', name)) - except Exception as err: - print 'LOGCPERROR: %s' % err - status = 'success' if ret: print 'Error: mic returned %d' % ret @@ -311,6 +305,18 @@ def main(): convert_image_dir(os.path.join(sync_src, 'images'), fields['repo'], fields['name']) + + # Copy logfile to sync directory + if not int(os.getenv('USE_VM')): + try: + target_log = os.path.join(outdir, build_id, 'images', \ + fields['repo'], name, os.path.basename(log)) + if not os.path.exists(os.path.dirname(target_log)): + os.makedirs(os.path.dirname(target_log)) + shutil.copy(log, target_log) + except Exception as err: + print 'LOGCPERROR: %s' % err + sync_status = 'success' for loop in range(2): -- 2.7.4