diff options
-rw-r--r-- | lkft-hikey-aosp-4.4.yaml | 11 | ||||
-rw-r--r-- | lkft-hikey-aosp-4.9.yaml | 12 |
2 files changed, 16 insertions, 7 deletions
diff --git a/lkft-hikey-aosp-4.4.yaml b/lkft-hikey-aosp-4.4.yaml index d0b6ac45df..8d1d61b478 100644 --- a/lkft-hikey-aosp-4.4.yaml +++ b/lkft-hikey-aosp-4.4.yaml @@ -74,13 +74,18 @@ out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER} PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} - - shell: | export DEVICE_TYPE=hi6220-hikey export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/ export PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} export DOWNLOAD_URL=https://snapshots.linaro.org/${PUB_DEST} + if [ -z "${KERNEL_DESCRIBE}" ]; then + export QA_BUILD_VERSION="${KERNEL_DESCRIBE}" + else + export QA_BUILD_VERSION=${KERNEL_COMMIT:0:12} + fi + rm -rf configs git clone --depth 1 http://git.linaro.org/ci/job/configs.git @@ -91,7 +96,7 @@ --qa-server ${QA_SERVER} \ --qa-server-team lkft \ --qa-server-project "aosp-${KERNEL_BRANCH}" \ - --git-commit ${KERNEL_COMMIT} \ + --git-commit ${QA_BUILD_VERSION} \ --template-path configs/lkft/lava-job-definitions \ --template-names template-boot.yaml template-vts-kernel-part1.yaml template-vts-kernel-part2.yaml template-vts-kernel-part3.yaml \ --quiet @@ -110,7 +115,7 @@ --qa-server ${QA_SERVER} \ --qa-server-team lkft \ --qa-server-project "aosp-${KERNEL_BRANCH}" \ - --git-commit ${KERNEL_COMMIT} \ + --git-commit ${QA_BUILD_VERSION} \ --template-path configs/lkft/lava-job-definitions \ --template-names template-cts.yaml \ --quiet diff --git a/lkft-hikey-aosp-4.9.yaml b/lkft-hikey-aosp-4.9.yaml index b37c968eda..209aac2fca 100644 --- a/lkft-hikey-aosp-4.9.yaml +++ b/lkft-hikey-aosp-4.9.yaml @@ -74,13 +74,18 @@ out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER} PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} - - shell: | export DEVICE_TYPE=hi6220-hikey export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/ export PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} export DOWNLOAD_URL=https://snapshots.linaro.org/${PUB_DEST} + if [ -z "${KERNEL_DESCRIBE}" ]; then + export QA_BUILD_VERSION="${KERNEL_DESCRIBE}" + else + export QA_BUILD_VERSION=${KERNEL_COMMIT:0:12} + fi + rm -rf configs git clone --depth 1 http://git.linaro.org/ci/job/configs.git @@ -91,7 +96,7 @@ --qa-server ${QA_SERVER} \ --qa-server-team lkft \ --qa-server-project "aosp-${KERNEL_BRANCH}" \ - --git-commit ${KERNEL_COMMIT} \ + --git-commit ${QA_BUILD_VERSION} \ --template-path configs/lkft/lava-job-definitions \ --template-names template-boot.yaml template-vts-kernel-part1.yaml template-vts-kernel-part2.yaml template-vts-kernel-part3.yaml \ --quiet @@ -110,12 +115,11 @@ --qa-server ${QA_SERVER} \ --qa-server-team lkft \ --qa-server-project "aosp-${KERNEL_BRANCH}" \ - --git-commit ${KERNEL_COMMIT} \ + --git-commit ${QA_BUILD_VERSION} \ --template-path configs/lkft/lava-job-definitions \ --template-names template-cts.yaml \ --quiet done - publishers: - logparser: parse-rules: '/var/lib/jenkins/userContent/android.parse' |