diff options
| -rw-r--r-- | lt-qcom-linux-integration.yaml | 3 | ||||
| -rwxr-xr-x | lt-qcom-linux-integration/builders.sh | 2 | ||||
| -rw-r--r-- | trigger-lt-qcom-linux-integration.yaml | 1 | ||||
| -rw-r--r-- | trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py | 11 |
4 files changed, 12 insertions, 5 deletions
diff --git a/lt-qcom-linux-integration.yaml b/lt-qcom-linux-integration.yaml index d653dc7488..d9e31b091f 100644 --- a/lt-qcom-linux-integration.yaml +++ b/lt-qcom-linux-integration.yaml @@ -24,6 +24,9 @@ name: KERNEL_MODULES_URL default: '' - string: + name: KERNEL_VERSION + default: 'noversion' + - string: name: KERNEL_DT_URL_dragonboard410c default: '' - string: diff --git a/lt-qcom-linux-integration/builders.sh b/lt-qcom-linux-integration/builders.sh index b14be449bd..137bc35a56 100755 --- a/lt-qcom-linux-integration/builders.sh +++ b/lt-qcom-linux-integration/builders.sh @@ -147,7 +147,7 @@ if [ -z ${SERIAL_CONSOLE} ]; then echo "INFO: No SERIAL_CONSOLE specified set to default: ${SERIAL_CONSOLE}" fi -boot_file=boot-linux-integration-${MACHINE}-${BUILD_NUMBER}.img +boot_file=boot-linux-integration-${KERNEL_VERSION}-${BUILD_NUMBER}-${MACHINE}.img if [[ $rootfs_file_type = *"cpio archive"* ]]; then ramdisk_file=$rootfs_file skales-mkbootimg \ diff --git a/trigger-lt-qcom-linux-integration.yaml b/trigger-lt-qcom-linux-integration.yaml index 1f823cb772..e0a195a081 100644 --- a/trigger-lt-qcom-linux-integration.yaml +++ b/trigger-lt-qcom-linux-integration.yaml @@ -43,6 +43,7 @@ predefined-parameters: | KERNEL_IMAGE_URL=${KERNEL_IMAGE_URL} KERNEL_MODULES_URL=${KERNEL_MODULES_URL} + KERNEL_VERSION=${KERNEL_VERSION} KERNEL_DT_URL_dragonboard410c=${KERNEL_DT_URL_dragonboard410c} ROOTFS_URL_dragonboard410c=${ROOTFS_URL_dragonboard410c} KERNEL_DT_URL_dragonboard820c=${KERNEL_DT_URL_dragonboard820c} diff --git a/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py b/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py index b1800f455c..9722886948 100644 --- a/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py +++ b/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py @@ -31,8 +31,9 @@ def get_kernel_ci_build(url, arch_config, dt_file): image_url = url + 'Image' dt_url = url + dt_file modules_url = url + 'modules.tar.xz' + version = last_build.contents[0].text[0:-1] # remove last / char - return (image_url, dt_url, modules_url) + return (image_url, dt_url, modules_url, version) def get_ramdisk_url(url): @@ -99,9 +100,9 @@ def main(): builds_url = os.environ.get('BUILDS_URL', 'https://snapshots.linaro.org/96boards/%s/linaro/linux-integration/') - image_url = None modules_url = None + version = None for m in machines: if m == 'dragonboard410c': kernel_ci_dt_file = 'dtbs/qcom/apq8016-sbc.dtb' @@ -110,8 +111,8 @@ def main(): else: sys.exit(2) - (image_url, dt_url, modules_url) = get_kernel_ci_build(kernel_ci_base_url, - kernel_ci_arch_config, kernel_ci_dt_file) + (image_url, dt_url, modules_url, version) = get_kernel_ci_build(kernel_ci_base_url, + kernel_ci_arch_config, kernel_ci_dt_file) print("KERNEL_DT_URL_%s=%s" % (m, dt_url)) validate_url(dt_url) @@ -132,6 +133,8 @@ def main(): validate_url(image_url) print("KERNEL_MODULES_URL=%s" % modules_url) validate_url(modules_url) + print("KERNEL_VERSION=%s" % version) + if __name__ == '__main__': try: |