lt-qcom-*: make use of more env variables to reduce diff between jobs

* UBUNTU_FLAVOUR and DEBIAN_VERSION were used for the same purpose in ubuntu vs
  debian builds.. Convert them both to OS_FLAVOUR.
* Use JOB_NAME whenever appropriate

This reduces the SNR when comparing jobs..

Change-Id: I03646033f4292fa7c99a7ebe8bd13415064dbf79
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

1 files changed, 21 insertions, 21 deletions

diff --git a/96boards-dragonboard410c.yaml b/96boards-dragonboard410c.yaml
index e4978637c7..bb6d42bfb6 100644
--- a/96boards-dragonboard410c.yaml
+++ b/96boards-dragonboard410c.yaml
@@ -25,7 +25,7 @@
             name: LAVA_SERVER
             default: 'validation.linaro.org/RPC2/'
         - string:
-            name: DEBIAN_VERSION
+            name: OS_FLAVOUR
             default: 'jessie'
         - string:
             name: PLATFORM_NAME
@@ -75,7 +75,7 @@
             cleanup_exit()
             {
               cd ${WORKSPACE}
-              sudo kpartx -dv out/linaro-${DEBIAN_VERSION}-*.sd.img || true
+              sudo kpartx -dv out/linaro-${OS_FLAVOUR}-*.sd.img || true
               rm -rf lci-build-tools
               rm -rf builddir*
               rm -rf out
@@ -151,9 +151,9 @@
             - netbase
             - udev
             sources:
-              qcom: http://repo.linaro.org/ubuntu/qcom-overlay ${DEBIAN_VERSION} main
-              repo: http://repo.linaro.org/ubuntu/linaro-overlay ${DEBIAN_VERSION} main
-              debian: http://ftp.debian.org/debian/ ${DEBIAN_VERSION} main contrib non-free
+              qcom: http://repo.linaro.org/ubuntu/qcom-overlay ${OS_FLAVOUR} main
+              repo: http://repo.linaro.org/ubuntu/linaro-overlay ${OS_FLAVOUR} main
+              debian: http://ftp.debian.org/debian/ ${OS_FLAVOUR} main contrib non-free
             packages:
             - linux-image-arm64
             - linux-headers-arm64
@@ -202,15 +202,15 @@
               # Get rootfs
               export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/debian-arm64-rootfs/label=build,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
               export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/debian-arm64-rootfs/label=build,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-${DEBIAN_VERSION}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
+              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-${OS_FLAVOUR}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
               wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
 
               # Create pre-built image(s)
-              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file linaro-${DEBIAN_VERSION}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img --image-size 2G --binary linaro-${DEBIAN_VERSION}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-lt-qcom_*.tar.gz --hwpack-force-yes --bootloader uefi
+              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file linaro-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img --image-size 2G --binary linaro-${OS_FLAVOUR}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-lt-qcom_*.tar.gz --hwpack-force-yes --bootloader uefi
 
               # Create eMMC rootfs image(s)
               mkdir rootfs
-              for device in $(sudo kpartx -av out/linaro-${DEBIAN_VERSION}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img | cut -d' ' -f3); do
+              for device in $(sudo kpartx -av out/linaro-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img | cut -d' ' -f3); do
                 partition=$(echo ${device} | cut -d'p' -f3)
                 [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
               done
@@ -233,13 +233,13 @@
 
               sudo rm -f rootfs/lib/firmware/wlan/macaddr0
 
-              sudo make_ext4fs -o -L rootfs -l 6800M -s out/linaro-${DEBIAN_VERSION}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img rootfs/
+              sudo make_ext4fs -o -L rootfs -l 6800M -s out/linaro-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img rootfs/
               sudo umount rootfs
-              sudo kpartx -dv out/linaro-${DEBIAN_VERSION}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
-              sudo rm -rf rootfs out/linaro-${DEBIAN_VERSION}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
+              sudo kpartx -dv out/linaro-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
+              sudo rm -rf rootfs out/linaro-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
 
               # Compress image(s)
-              gzip -9 out/linaro-${DEBIAN_VERSION}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img
+              gzip -9 out/linaro-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img
 
               cat >> out/README.txt << EOF
             Linaro Debian ${rootfs} build: http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}
@@ -259,12 +259,12 @@
             mkbootimg \
               --kernel out/Image \
               --ramdisk out/initrd.img-* \
-              --output out/boot-linaro-${DEBIAN_VERSION}-${PLATFORM_NAME}-${VERSION}.img \
+              --output out/boot-linaro-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img \
               --dt out/dt.img \
               --pagesize "2048" \
               --base "0x80000000" \
               --cmdline "root=/dev/disk/by-partlabel/rootfs rw rootwait console=tty0 console=${SERIAL_CONSOLE},115200n8"
-            gzip -9 out/boot-linaro-${DEBIAN_VERSION}-${PLATFORM_NAME}-${VERSION}.img
+            gzip -9 out/boot-linaro-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img
 
             # Final preparation for publishing
             cp -a linux-*.deb out/
@@ -315,8 +315,8 @@
             git log -1
 
             cd emmc_linux
-            cp ../../out/boot-linaro-${DEBIAN_VERSION}-${PLATFORM_NAME}-${VERSION}.img.gz boot.img.gz
-            cp ../../out/linaro-${DEBIAN_VERSION}-alip-${PLATFORM_NAME}-${VERSION}.img.gz rootfs.img.gz
+            cp ../../out/boot-linaro-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img.gz boot.img.gz
+            cp ../../out/linaro-${OS_FLAVOUR}-alip-${PLATFORM_NAME}-${VERSION}.img.gz rootfs.img.gz
             gunzip *.img.gz
 
             cat << EOF >> os.json
@@ -325,7 +325,7 @@
             "url": "http://builds.96boards.org/releases/dragonboard410c",
             "version": "${VERSION}",
             "release_date": "`date +%Y-%m-%d`",
-            "description": "Linaro Linux with LXDE desktop based on Debian (${DEBIAN_VERSION}) for DragonBoard 410c"
+            "description": "Linaro Linux with LXDE desktop based on Debian (${OS_FLAVOUR}) for DragonBoard 410c"
             }
             EOF
 
@@ -357,8 +357,8 @@
         - shell: |
             VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
 
-            export BOOT_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/boot-linaro-${DEBIAN_VERSION}-${PLATFORM_NAME}-${VERSION}.img.gz
-            export ROOTFS_BUILD_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/linaro-${DEBIAN_VERSION}-developer-${PLATFORM_NAME}-${VERSION}.img.gz
+            export BOOT_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/boot-linaro-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img.gz
+            export ROOTFS_BUILD_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/linaro-${OS_FLAVOUR}-developer-${PLATFORM_NAME}-${VERSION}.img.gz
 
             rm -rf configs lci-build-tools
             git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
@@ -378,8 +378,8 @@
         - shell: |
             VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
 
-            export BOOT_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/boot-linaro-${DEBIAN_VERSION}-${PLATFORM_NAME}-${VERSION}.img.gz
-            export ROOTFS_BUILD_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/linaro-${DEBIAN_VERSION}-developer-${PLATFORM_NAME}-${VERSION}.img.gz
+            export BOOT_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/boot-linaro-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img.gz
+            export ROOTFS_BUILD_URL=http://builds.96boards.org/snapshots/dragonboard410c/linaro/debian/${BUILD_NUMBER}/linaro-${OS_FLAVOUR}-developer-${PLATFORM_NAME}-${VERSION}.img.gz
 
             ./lci-build-tools/yaml-to-json.py configs/${JOB_NAME}/lava-job-definitions/${DEVICE_TYPE}/template-ltp.yaml > custom_lava_job_definition_ltp.json