avocado: Rename job output dir

We used 'run' as a prefix for avocado job output directories
after virt-test (basically, inertia). Let's use something
better:

job-[first 8 characters of job id]-timestamp

This way the job id starts to be more prominent in the
human interface as well.
Signed-off-by: NLucas Meneghel Rodrigues <lmr@redhat.com>
上级 7774632f
......@@ -32,6 +32,7 @@ import sys
import shutil
import time
import tempfile
import uuid
from avocado.utils import path
from avocado.settings import settings
......@@ -189,7 +190,7 @@ def get_logs_dir():
return _get_rw_dir(SETTINGS_LOG_DIR, SYSTEM_LOG_DIR, USER_LOG_DIR)
def get_job_logs_dir(args=None):
def get_job_logs_dir(args=None, unique_id=None):
"""
Create a log directory for a job, or a stand alone execution of a test.
......@@ -204,7 +205,11 @@ def get_job_logs_dir(args=None):
logdir = args.logdir or get_logs_dir()
else:
logdir = get_logs_dir()
debugbase = 'run-%s' % start_time
# Stand alone tests handling
if unique_id is None:
unique_id = str(uuid.uuid4())
debugbase = 'job-%s-%s' % (unique_id[:8], start_time)
debugdir = path.init_dir(logdir, debugbase)
latestdir = os.path.join(logdir, "latest")
try:
......
......@@ -241,7 +241,7 @@ class Job(object):
self.unique_id = args.unique_id or str(uuid.uuid4())
else:
self.unique_id = str(uuid.uuid4())
self.logdir = data_dir.get_job_logs_dir(self.args)
self.logdir = data_dir.get_job_logs_dir(self.args, self.unique_id)
self.logfile = os.path.join(self.logdir, "debug.log")
if self.args is not None:
self.loglevel = args.log_level or logging.DEBUG
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册