lkft: prepare for support of rc builds on android.linaro.org

add the parameter of KERNEL_BRANCH for the rc builds,
and use ${MAKE_KERNELVERSION}-${KERNEL_COMMIT:0:12} as
the ci build describe instead of using KERNEL_DESCRIBE directly,

the same is done when submit the jobs to qa-report.

The same will be done on the trigger side as well

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

8 files changed, 27 insertions, 2 deletions

diff --git a/lkft-db845c-5.4-rc.yaml b/lkft-db845c-5.4-rc.yaml
index e1aeb95673..5f0d70df50 100644
--- a/lkft-db845c-5.4-rc.yaml
+++ b/lkft-db845c-5.4-rc.yaml
@@ -30,6 +30,8 @@
             name: SRCREV_kernel
         - string:
             name: MAKE_KERNELVERSION
+        - string:
+            name: KERNEL_BRANCH
     disabled: false
     node: docker-xenial-android-lkft
     display-name: 'LKFT - Dragonboard845c builds with kernel android-5.4 + 5.4 rc changes'
diff --git a/lkft-hikey-4.14-rc.yaml b/lkft-hikey-4.14-rc.yaml
index 6bb9beb415..9c191a16ac 100644
--- a/lkft-hikey-4.14-rc.yaml
+++ b/lkft-hikey-4.14-rc.yaml
@@ -33,6 +33,8 @@
             name: SRCREV_kernel
         - string:
             name: MAKE_KERNELVERSION
+        - string:
+            name: KERNEL_BRANCH
     disabled: false
     node: docker-xenial-android-lkft
     display-name: 'LKFT - HiKey builds with kernel 4.14 + 4.14 rc changes'
diff --git a/lkft-hikey-4.19-rc.yaml b/lkft-hikey-4.19-rc.yaml
index 48a1cf40da..f6e1277c05 100644
--- a/lkft-hikey-4.19-rc.yaml
+++ b/lkft-hikey-4.19-rc.yaml
@@ -33,6 +33,8 @@
             name: SRCREV_kernel
         - string:
             name: MAKE_KERNELVERSION
+        - string:
+            name: KERNEL_BRANCH
     disabled: false
     node: docker-xenial-android-lkft
     display-name: 'LKFT - HiKey builds with kernel 4.19 + 4.19 rc changes'
diff --git a/lkft-hikey-4.4-rc-p.yaml b/lkft-hikey-4.4-rc-p.yaml
index 3fd0412513..654e9b70fa 100644
--- a/lkft-hikey-4.4-rc-p.yaml
+++ b/lkft-hikey-4.4-rc-p.yaml
@@ -30,6 +30,8 @@
             name: SRCREV_kernel
         - string:
             name: MAKE_KERNELVERSION
+        - string:
+            name: KERNEL_BRANCH
     disabled: false
     node: docker-xenial-android-lkft
     display-name: 'LKFT - HiKey builds with kernel 4.4-p + 4.4 rc changes'
diff --git a/lkft-hikey-4.9-rc.yaml b/lkft-hikey-4.9-rc.yaml
index fd2a94a091..1dd41e2c79 100644
--- a/lkft-hikey-4.9-rc.yaml
+++ b/lkft-hikey-4.9-rc.yaml
@@ -33,6 +33,8 @@
             name: SRCREV_kernel
         - string:
             name: MAKE_KERNELVERSION
+        - string:
+            name: KERNEL_BRANCH
     disabled: false
     node: docker-xenial-android-lkft
     display-name: 'LKFT - HiKey builds with kernel 4.9 + 4.9 rc changes'
diff --git a/lkft-hikey-aosp-master-4.14-lkft.yaml b/lkft-hikey-aosp-master-4.14-lkft.yaml
index e2f76ef523..42e46ea186 100644
--- a/lkft-hikey-aosp-master-4.14-lkft.yaml
+++ b/lkft-hikey-aosp-master-4.14-lkft.yaml
@@ -27,6 +27,8 @@
             name: SRCREV_kernel
         - string:
             name: MAKE_KERNELVERSION
+        - string:
+            name: KERNEL_BRANCH
     disabled: false
     node: docker-xenial-android-lkft
     display-name: 'LKFT - HiKey/HiKey960 aosp master builds with kernel android-hikey-linaro-4.14-lkft'
diff --git a/lkft-hikey-aosp-master-4.19-lkft.yaml b/lkft-hikey-aosp-master-4.19-lkft.yaml
index 44eef325b4..ef949b7af1 100644
--- a/lkft-hikey-aosp-master-4.19-lkft.yaml
+++ b/lkft-hikey-aosp-master-4.19-lkft.yaml
@@ -27,6 +27,8 @@
             name: SRCREV_kernel
         - string:
             name: MAKE_KERNELVERSION
+        - string:
+            name: KERNEL_BRANCH
     disabled: false
     node: docker-xenial-android-lkft
     display-name: 'LKFT - HiKey/HiKey960 aosp master builds with kernel android-hikey-linaro-4.19-lkft'
diff --git a/lkft/common/builders-v2.sh b/lkft/common/builders-v2.sh
index bb250388ff..fc28fa4802 100755
--- a/lkft/common/builders-v2.sh
+++ b/lkft/common/builders-v2.sh
@@ -2,8 +2,19 @@
 
 # call api of android.linaro.org for lkft report check scheduling
 if [ -n "${KERNEL_BRANCH}" ] && [ -n "${KERNEL_DESCRIBE}" ] && [ -n "${JOB_NAME}" ] && [ -n "${BUILD_NUMBER}" ]; then
-    curl -L https://android.linaro.org/lkft/newbuild/${KERNEL_BRANCH}/${KERNEL_DESCRIBE}/${JOB_NAME}/${BUILD_NUMBER} || true
-    curl -L http://213.146.155.43/lkft/newbuild/${KERNEL_BRANCH}/${KERNEL_DESCRIBE}/${JOB_NAME}/${BUILD_NUMBER} || true
+
+    # environments set by the upstream trigger job
+    KERNEL_COMMIT=${SRCREV_kernel}
+    if [ -n "${MAKE_KERNELVERSION}" ] && echo "X${USE_KERNELVERSION_FOR_QA_BUILD_VERSION}" | grep -i "Xtrue"; then
+        QA_BUILD_VERSION=${MAKE_KERNELVERSION}-${KERNEL_COMMIT:0:12}
+    elif [ ! -z "${KERNEL_DESCRIBE}" ]; then
+        QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+    else
+        QA_BUILD_VERSION=${KERNEL_COMMIT:0:12}
+    fi
+
+    curl -L https://android.linaro.org/lkft/newbuild/${KERNEL_BRANCH}/${QA_BUILD_VERSION}/${JOB_NAME}/${BUILD_NUMBER} || true
+    curl -L http://213.146.155.43/lkft/newbuild/${KERNEL_BRANCH}/${QA_BUILD_VERSION}/${JOB_NAME}/${BUILD_NUMBER} || true
 fi
 
 git config --global user.email "ci_notify@linaro.org"