diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2020-01-09 20:09:59 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2020-01-10 02:50:58 +0000 |
| commit | f34a178801a6388254cd51f14f5366e67ad4d71b (patch) | |
| tree | 98ffe33f71b88480dc42cc6fd385a96ab7a59558 | |
| parent | 9b5830a531c0be59c17c3c1979603fddcd4ecb05 (diff) | |
lkft android: use kernel version for qa-report build version
as the git describe information is not correct always for the linux-stable-rc kernels,
we changed to use the kernelversion + commit as the label
Change-Id: I380e1d4d4f336be845b0de59414ddbda25da80ca
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | lkft-hikey-4.14-rc.yaml | 3 | ||||
| -rw-r--r-- | lkft-hikey-4.19-rc.yaml | 3 | ||||
| -rw-r--r-- | lkft-hikey-4.9-rc.yaml | 3 | ||||
| -rwxr-xr-x | lkft/lava-job-definitions/common/submit_for_testing-v2.sh | 4 |
4 files changed, 12 insertions, 1 deletions
diff --git a/lkft-hikey-4.14-rc.yaml b/lkft-hikey-4.14-rc.yaml index c1f15583e6..52e2e3f49a 100644 --- a/lkft-hikey-4.14-rc.yaml +++ b/lkft-hikey-4.14-rc.yaml @@ -25,6 +25,9 @@ name: TEST_QA_SERVER_ENVIRONMENT_ENABLED default: true - string: + name: USE_KERNELVERSION_FOR_QA_BUILD_VERSION + default: true + - string: name: KERNEL_DESCRIBE - string: name: SRCREV_kernel diff --git a/lkft-hikey-4.19-rc.yaml b/lkft-hikey-4.19-rc.yaml index dc2f81d27d..464d171680 100644 --- a/lkft-hikey-4.19-rc.yaml +++ b/lkft-hikey-4.19-rc.yaml @@ -25,6 +25,9 @@ name: TEST_QA_SERVER_ENVIRONMENT_ENABLED default: true - string: + name: USE_KERNELVERSION_FOR_QA_BUILD_VERSION + default: true + - string: name: KERNEL_DESCRIBE - string: name: SRCREV_kernel diff --git a/lkft-hikey-4.9-rc.yaml b/lkft-hikey-4.9-rc.yaml index c7b9c50634..5b90f2926d 100644 --- a/lkft-hikey-4.9-rc.yaml +++ b/lkft-hikey-4.9-rc.yaml @@ -25,6 +25,9 @@ name: TEST_QA_SERVER_ENVIRONMENT_ENABLED default: true - string: + name: USE_KERNELVERSION_FOR_QA_BUILD_VERSION + default: true + - string: name: KERNEL_DESCRIBE - string: name: SRCREV_kernel diff --git a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh index 26389db2aa..92f7ceb59e 100755 --- a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh +++ b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh @@ -191,7 +191,9 @@ function submit_jobs(){ # environments set by the upstream trigger job KERNEL_COMMIT=${SRCREV_kernel} - if [ ! -z "${KERNEL_DESCRIBE}" ]; then + 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} |