Moved board parsing to parse.py
Board parsing was being done inside of insert_job, meaning that
information was only available after it had been inserted into
the database. This information can be parsed before it is
inserted.
BUG=b:35154781
TEST=Ran a test
Change-Id: Iab174d0177766a82d6132e3110b1d1ad13ca1e7c
Reviewed-on: https://chromium-review.googlesource.com/440464
Commit-Ready: Tom Turney <tturney@google.com>
Tested-by: Benjamin Peake <bpeake@chromium.org>
Tested-by: Tom Turney <tturney@google.com>
Reviewed-by: Dan Shi <dshi@google.com>
diff --git a/tko/db.py b/tko/db.py
index 99f9621..1e23856 100644
--- a/tko/db.py
+++ b/tko/db.py
@@ -13,7 +13,6 @@
from autotest_lib.client.common_lib import global_config
from autotest_lib.client.common_lib.cros.graphite import autotest_stats
from autotest_lib.frontend import database_settings_helper
-from autotest_lib.server import site_utils
from autotest_lib.tko import utils
@@ -468,18 +467,14 @@
'started_time': job.started_time,
'finished_time': job.finished_time,
'afe_job_id': afe_job_id,
- 'afe_parent_job_id': parent_job_id}
+ 'afe_parent_job_id': parent_job_id,
+ 'build': job.build,
+ 'build_version': job.build_version,
+ 'board': job.board,
+ 'suite': job.suite}
job.afe_job_id = afe_job_id
if parent_job_id:
job.afe_parent_job_id = str(parent_job_id)
- if job.label:
- label_info = site_utils.parse_job_name(job.label)
- if label_info:
- data['build'] = label_info.get('build', None)
- job.build_version = data['build_version'] = label_info.get(
- 'build_version', None)
- job.board = data['board'] = label_info.get('board', None)
- job.suite = data['suite'] = label_info.get('suite', None)
# TODO(ntang): check job.index directly.
is_update = hasattr(job, 'index')