From 0b34e6ac0d43e308ac488c2171a1fdbfcd601402 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Tue, 25 Feb 2020 12:41:57 +0800 Subject: lkft: update lkft/lkft_config.py and fix one copy/paste error Signed-off-by: Yongqin Liu --- lkft/lkft_config.py | 19 +++++-------------- lkft/views.py | 2 +- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/lkft/lkft_config.py b/lkft/lkft_config.py index 359913f..d105ac5 100644 --- a/lkft/lkft_config.py +++ b/lkft/lkft_config.py @@ -9,24 +9,14 @@ citrigger_lkft = { 'aosp-master-tracking-x15':'lkft-aosp-master-x15', }, - 'trigger-lkft-aosp-mainline': { - 'mainline-9.0-x15': 'lkft-android-9.0-mainline-x15', - 'mainline-9.0-x15-auto': 'lkft-android-9.0-mainline-x15', - 'mainline-aosp-master-x15': 'lkft-x15-aosp-master-mainline', - - 'mainline-gki-aosp-master-db845c': 'lkft-db845c-aosp-master-mainline', - 'mainline-aosp-master-db845c': 'lkft-db845c-aosp-master-mainline', - - 'mainline-gki-aosp-master-hikey': 'lkft-hikey-aosp-master-mainline-gki', - 'mainline-aosp-master-hikey': 'lkft-hikey-aosp-master-mainline-gki', - 'mainline-gki-aosp-master-hikey960': 'lkft-hikey960-aosp-master-mainline-gki', - 'mainline-aosp-master-hikey960': 'lkft-hikey960-aosp-master-mainline-gki', - }, - 'trigger-lkft-android-common': { '5.4-gki-aosp-master-hikey': 'lkft-hikey-aosp-master-5.4', '5.4-gki-aosp-master-hikey960': 'lkft-hikey960-aosp-master-5.4', '5.4-gki-aosp-master-db845c': 'lkft-db845c-aosp-master-5.4', + + 'mainline-aosp-master-x15': 'lkft-x15-aosp-master-mainline', + 'mainline-gki-aosp-master-db845c': 'lkft-db845c-aosp-master-mainline', + 'mainline-gki-aosp-master-hikey960': 'lkft-hikey960-aosp-master-mainline-gki', }, # configs for TI 4.14 and 4.19 kernels @@ -41,6 +31,7 @@ citrigger_lkft = { 'trigger-lkft-x15-4.14': { '4.14-8.1-x15': 'lkft-x15-android-8.1-4.14', }, + # configs for 4.14 kernels 'trigger-lkft-hikey-4.14': { '4.14-8.1-hikey': 'lkft-hikey-android-8.1-4.14', diff --git a/lkft/views.py b/lkft/views.py index 351a281..aee294d 100644 --- a/lkft/views.py +++ b/lkft/views.py @@ -385,7 +385,7 @@ def get_project_info(project): builds = qa_report_api.get_all_builds(project.get('id'), only_first=True) if len(builds) > 0: last_build = builds[0] - last_build['created_at'] = qa_report_api.get_aware_datetime_from_str(last_build.get('fetched_at')) + last_build['created_at'] = qa_report_api.get_aware_datetime_from_str(last_build.get('created_at')) jobs = qa_report_api.get_jobs_for_build(last_build.get("id")) last_build['numbers_of_result'] = get_test_result_number_for_build(last_build, jobs) -- cgit v1.2.3