From 9188b0876bf8e98c1e62ae7202b03cffbf940011 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Wed, 24 Dec 2014 15:49:55 +0200 Subject: linux-linaro-stable-lsk: avoid to return multiple hwpack results ls hwpack* command expect a single value. make sure we only have 1 hwpack returned. Change-Id: I79cb54fae6a68018c50859b78c2ab9c4fe826828 Signed-off-by: Fathi Boudra --- linux-linaro-stable-lsk.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'linux-linaro-stable-lsk.yaml') diff --git a/linux-linaro-stable-lsk.yaml b/linux-linaro-stable-lsk.yaml index 394a5bd..bd6b979 100644 --- a/linux-linaro-stable-lsk.yaml +++ b/linux-linaro-stable-lsk.yaml @@ -174,7 +174,7 @@ [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/ [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour} - cp -a hwpack_linaro-${hwpack_type}* out/ + mv hwpack_linaro-${hwpack_type}* out/ ${HOME}/bin/linaro-cp out kernel-hwpack/linux-linaro-stable-lsk-${hwpack}/${BUILD_NUMBER} @@ -182,7 +182,7 @@ CCACHE_DIR=${CCACHE_DIR} ccache -s KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-${hwpack}/${BUILD_NUMBER}" - HWPACK_BUILD_URL="${KERNEL_URL}/`ls hwpack_linaro-${hwpack_type}*.tar.gz`" + HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`" STARTUP_NSH="${KERNEL_URL}/startup.nsh" # Create post-build-lava parameters @@ -201,23 +201,23 @@ case "${hwpack}" in arndale|panda|vexpress) # Get rootfs URL - ROOTFS_BUILD_NUMBER=693 - ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz" + export ROOTFS_BUILD_NUMBER=693 + export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz" ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json ;; arndale-be|panda-be|vexpress-be) # Get rootfs URL - ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber` - ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd` - ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz" + export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber` + export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd` + export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz" ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json ;; vexpress64) # Get rootfs URL - ROOTFS_BUILD_NUMBER=729 - ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20141212-729.rootfs.tar.gz" + export ROOTFS_BUILD_NUMBER=729 + export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20141212-729.rootfs.tar.gz" ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json ;; @@ -243,8 +243,8 @@ DEVICE_TYPE=juno # Get rootfs URL - ROOTFS_BUILD_NUMBER=729 - ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20141212-729.rootfs.tar.gz" + export ROOTFS_BUILD_NUMBER=729 + export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20141212-729.rootfs.tar.gz" if grep -Fxq 'CONFIG_EFI=y' kernel.config; then ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json @@ -259,8 +259,8 @@ DEVICE_TYPE=juno # Get rootfs URL - ROOTFS_BUILD_NUMBER=311 - ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20141212-311.rootfs.tar.gz" + export ROOTFS_BUILD_NUMBER=311 + export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20141212-311.rootfs.tar.gz" if grep -Fxq 'CONFIG_EFI=y' kernel.config; then ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json -- cgit v1.2.3