lkft: update the implementation for find_expect_cibuilds

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

3 files changed, 53 insertions, 10 deletions

diff --git a/lkft/lkft_config.py b/lkft/lkft_config.py
index 34eefd2..95fb478 100644
--- a/lkft/lkft_config.py
+++ b/lkft/lkft_config.py
@@ -102,17 +102,60 @@ citrigger_lkft_rcs = {
 }
 
 
-def find_expect_cibuilds(trigger_name=None):
+trigger_branch_builds_info = {
+    'trigger-lkft-android-common':{
+        'android-5.4': ['lkft-hikey-aosp-master-5.4',
+                        'lkft-hikey960-aosp-master-5.4',
+                        'lkft-db845c-aosp-master-5.4'],
+
+        'android-mainline': ['lkft-x15-aosp-master-mainline',
+                            'lkft-db845c-aosp-master-mainline',
+                            'lkft-hikey960-aosp-master-mainline-gki'],
+    },
+
+    # configs for hikey kernels
+    'trigger-linux-stable-rc': {
+        'linux-4.4.y': ['lkft-hikey-4.4-rc-p'],
+        'linux-4.9.y': ['lkft-hikey-4.9-rc'],
+        'linux-4.14.y': ['lkft-hikey-4.14-rc'],
+        'linux-4.19.y': ['lkft-hikey-4.19-rc'],
+        'linux-5.4.y': ['lkft-db845c-5.4-rc'],
+        },
+
+    # configs for hikey kernels
+    'trigger-lkft-hikey-stable': {
+        'android-4.4-o-hikey': ['lkft-hikey-4.4-o'],
+        'android-4.4-p-hikey': ['lkft-hikey-4.4-p'],
+        'android-4.9-o-hikey': ['lkft-hikey-4.9-o'],
+        'android-4.9-p-hikey': ['lkft-hikey-aosp-4.9-premerge-ci'],
+        'android-4.9-q-hikey': ['lkft-hikey-10.0-4.9-q'],
+        'android-4.14-p-hikey': ['lkft-hikey-aosp-4.14-premerge-ci'],
+        'android-4.14-q-hikey': ['lkft-hikey-10.0-4.14-q'],
+        'android-4.19-q-hikey': ['lkft-hikey-android-10.0-gsi-4.19']
+        },
+
+    # configs for 4.14 kernels
+    'trigger-lkft-hikey-4.14': {
+        'android-hikey-linaro-4.14': ['lkft-hikey-android-8.1-4.14'],
+        },
+
+    # configs for hikey kernels
+    'trigger-lkft-aosp-hikey': {
+        'android-hikey-linaro-4.14': ['lkft-hikey-aosp-master-4.14'],
+        'android-hikey-linaro-4.19': ['lkft-hikey-aosp-master-4.19'],
+        },
+}
+
+def find_expect_cibuilds(trigger_name=None, branch_name=None):
     if not trigger_name:
         return set([])
-    lkft_builds = citrigger_lkft.get(trigger_name)
-    lkft_rc_builds = citrigger_lkft_rcs.get(trigger_name)
-    if lkft_builds is not None:
-        return set(lkft_builds.values())
-    elif lkft_rc_builds is not None:
-        return set(lkft_rc_builds.values())
-    else:
+    branches = trigger_branch_builds_info.get(trigger_name)
+    if branches is None:
+        return set([])
+    builds = branches.get(branch_name)
+    if builds is None:
         return set([])
+    return set(builds)
 
 def get_ci_trigger_info(project=None):
     if not project.get('full_name'):
diff --git a/lkft/management/commands/lkftreport.py b/lkft/management/commands/lkftreport.py
index 4def12e..63d3422 100644
--- a/lkft/management/commands/lkftreport.py
+++ b/lkft/management/commands/lkftreport.py
@@ -98,7 +98,7 @@ class Command(BaseCommand):
             kernel_change_status = "TRIGGER_BUILD_COMPLETED"
 
             dbci_builds = CiBuild.objects_kernel_change.get_builds_per_kernel_change(kernel_change=kernel_change).order_by('name', '-number')
-            expect_build_names = find_expect_cibuilds(trigger_name=kernel_change.trigger_name)
+            expect_build_names = find_expect_cibuilds(trigger_name=kernel_change.trigger_name, branch_name=kernel_change.branch)
 
             jenkins_ci_builds = []
             ci_build_names = []
diff --git a/lkft/views.py b/lkft/views.py
index 9dc17eb..2175c3a 100644
--- a/lkft/views.py
+++ b/lkft/views.py
@@ -1137,7 +1137,7 @@ def list_kernel_changes(request):
         kernel_change_status = "TRIGGER_BUILD_COMPLETED"
 
         dbci_builds = CiBuild.objects_kernel_change.get_builds_per_kernel_change(kernel_change=db_kernelchange).order_by('name', '-number')
-        expect_build_names = find_expect_cibuilds(trigger_name=db_kernelchange.trigger_name)
+        expect_build_names = find_expect_cibuilds(trigger_name=db_kernelchange.trigger_name, branch_name=db_kernelchange.branch)
 
         lkft_build_configs = []
         jenkins_ci_builds = []