lt-qcom-debian-images-arm64: split sd card installer into its own shell script

So that we can later reuse the builders.sh script for builds when there is no
need to create an SD card. The SD card installer script is board specific (at
least for now), so use a board specific name for the script.

Put the publishing script snippet back into the .yaml file, as this part is very
job specific, and not generic.

This commit should be a no-op.

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

2 files changed, 78 insertions, 82 deletions

diff --git a/lt-qcom-debian-images-arm64/builders.sh b/lt-qcom-debian-images-arm64/builders.sh
index 42e996599d..186b9339ae 100644
--- a/lt-qcom-debian-images-arm64/builders.sh
+++ b/lt-qcom-debian-images-arm64/builders.sh
@@ -217,87 +217,5 @@ mkbootimg \
     --cmdline "root=/dev/disk/by-partlabel/rootfs rw rootwait console=tty0 console=${SERIAL_CONSOLE},115200n8"
 gzip -9 out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img
 
-# Create boot image for SD installer
-mkbootimg \
-    --kernel out/Image \
-    --ramdisk out/initrd.img-* \
-    --output out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img \
-    --dt out/dt.img \
-    --pagesize "2048" \
-    --base "0x80000000" \
-    --cmdline "root=/dev/mmcblk1p8 rw rootwait console=${SERIAL_CONSOLE},115200n8"
-gzip -9 out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img
-
 # Final preparation for publishing
 cp -a linux-*.deb out/
-
-#######################################
-# let's create the SD install image now
-#######################################
-
-git clone --depth 1 -b master https://git.linaro.org/people/nicolas.dechesne/db-boot-tools.git
-# record commit info in build log
-cd db-boot-tools
-git log -1
-
-# Get SD and EMMC bootloader package
-BL_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/lt-qcom-db410c-bootloader/lastSuccessfulBuild/buildNumber`
-wget --progress=dot -e dotbytes=2M \
-     http://builds.96boards.org/snapshots/dragonboard410c/linaro/rescue-ng/${BL_BUILD_NUMBER}/dragonboard410c_bootloader_sd_linux-${BL_BUILD_NUMBER}.zip
-wget --progress=dot -e dotbytes=2M \
-     http://builds.96boards.org/snapshots/dragonboard410c/linaro/rescue-ng/${BL_BUILD_NUMBER}/dragonboard410c_bootloader_emmc_linux-${BL_BUILD_NUMBER}.zip
-
-unzip -d out dragonboard410c_bootloader_sd_linux-${BL_BUILD_NUMBER}.zip
-cp ${WORKSPACE}/out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img.gz out/boot.img.gz
-cp ${WORKSPACE}/out/${VENDOR}-${OS_FLAVOUR}-installer-${PLATFORM_NAME}-${VERSION}.img.gz out/rootfs.img.gz
-gunzip out/{boot,rootfs}.img.gz
-
-mkdir -p os/debian
-cp ${WORKSPACE}/out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img.gz os/debian/boot.img.gz
-cp ${WORKSPACE}/out/${VENDOR}-${OS_FLAVOUR}-alip-${PLATFORM_NAME}-${VERSION}.img.gz os/debian/rootfs.img.gz
-gunzip os/debian/{boot,rootfs}.img.gz
-
-cat << EOF >> os/debian/os.json
-{
-"name": "Linaro Linux Desktop for DragonBoard 410c - Build #${BUILD_NUMBER}",
-"url": "http://builds.96boards.org/releases/dragonboard410c",
-"version": "${VERSION}",
-"release_date": "`date +%Y-%m-%d`",
-"description": "Linaro Linux with LXDE desktop based on Debian (${OS_FLAVOUR}) for DragonBoard 410c"
-}
-EOF
-
-cp mksdcard flash os/
-cp dragonboard410c/linux/partitions.txt os/debian
-unzip -d os/debian dragonboard410c_bootloader_emmc_linux-${BL_BUILD_NUMBER}.zip
-
-# get size of OS partition
-size_os=$(du -sk os | cut -f1)
-size_os=$(((($size_os + 1024 - 1) / 1024) * 1024))
-size_os=$(($size_os + 200*1024))
-# pad for SD image size (including rootfs and bootloaders)
-size_img=$(($size_os + 1024*1024 + 300*1024))
-
-# create OS image
-sudo rm -f out/os.img
-sudo mkfs.fat -a -F32 -n "OS" -C out/os.img $size_os
-mkdir -p mnt
-sudo mount -o loop out/os.img mnt
-sudo cp -r os/* mnt/
-sudo umount mnt
-sudo ./mksdcard -p dragonboard410c/linux/installer.txt -s $size_img -i out -o db410c_sd_install_debian.img
-
-# create archive for publishing
-zip -j ${WORKSPACE}/out/dragonboard410c_sdcard_install_debian-${BUILD_NUMBER}.zip db410c_sd_install_debian.img ${WORKSPACE}/license.txt
-cd ..
-
-# Create MD5SUMS file
-(cd out && md5sum * > MD5SUMS.txt)
-
-# Publish to snapshots
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-     --server ${PUBLISH_SERVER} \
-     --link-latest \
-     out snapshots/dragonboard410c/${VENDOR}/debian/${BUILD_NUMBER}
diff --git a/lt-qcom-debian-images-arm64/installer-dragonboard-410c.sh b/lt-qcom-debian-images-arm64/installer-dragonboard-410c.sh
new file mode 100644
index 0000000000..f2bdae6a47
--- /dev/null
+++ b/lt-qcom-debian-images-arm64/installer-dragonboard-410c.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    cd ${WORKSPACE}
+    sudo git clean -fdxq
+}
+
+# Create boot image for SD installer
+mkbootimg \
+    --kernel out/Image \
+    --ramdisk out/initrd.img-* \
+    --output out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img \
+    --dt out/dt.img \
+    --pagesize "2048" \
+    --base "0x80000000" \
+    --cmdline "root=/dev/mmcblk1p8 rw rootwait console=${SERIAL_CONSOLE},115200n8"
+gzip -9 out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img
+
+git clone --depth 1 -b master https://git.linaro.org/people/nicolas.dechesne/db-boot-tools.git
+# record commit info in build log
+cd db-boot-tools
+git log -1
+
+# Get SD and EMMC bootloader package
+BL_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/lt-qcom-db410c-bootloader/lastSuccessfulBuild/buildNumber`
+wget --progress=dot -e dotbytes=2M \
+     http://builds.96boards.org/snapshots/dragonboard410c/linaro/rescue-ng/${BL_BUILD_NUMBER}/dragonboard410c_bootloader_sd_linux-${BL_BUILD_NUMBER}.zip
+wget --progress=dot -e dotbytes=2M \
+     http://builds.96boards.org/snapshots/dragonboard410c/linaro/rescue-ng/${BL_BUILD_NUMBER}/dragonboard410c_bootloader_emmc_linux-${BL_BUILD_NUMBER}.zip
+
+unzip -d out dragonboard410c_bootloader_sd_linux-${BL_BUILD_NUMBER}.zip
+cp ${WORKSPACE}/out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img.gz out/boot.img.gz
+cp ${WORKSPACE}/out/${VENDOR}-${OS_FLAVOUR}-installer-${PLATFORM_NAME}-${VERSION}.img.gz out/rootfs.img.gz
+gunzip out/{boot,rootfs}.img.gz
+
+mkdir -p os/debian
+cp ${WORKSPACE}/out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img.gz os/debian/boot.img.gz
+cp ${WORKSPACE}/out/${VENDOR}-${OS_FLAVOUR}-alip-${PLATFORM_NAME}-${VERSION}.img.gz os/debian/rootfs.img.gz
+gunzip os/debian/{boot,rootfs}.img.gz
+
+cat << EOF >> os/debian/os.json
+{
+"name": "Linaro Linux Desktop for DragonBoard 410c - Build #${BUILD_NUMBER}",
+"url": "http://builds.96boards.org/releases/dragonboard410c",
+"version": "${VERSION}",
+"release_date": "`date +%Y-%m-%d`",
+"description": "Linaro Linux with LXDE desktop based on Debian (${OS_FLAVOUR}) for DragonBoard 410c"
+}
+EOF
+
+cp mksdcard flash os/
+cp dragonboard410c/linux/partitions.txt os/debian
+unzip -d os/debian dragonboard410c_bootloader_emmc_linux-${BL_BUILD_NUMBER}.zip
+
+# get size of OS partition
+size_os=$(du -sk os | cut -f1)
+size_os=$(((($size_os + 1024 - 1) / 1024) * 1024))
+size_os=$(($size_os + 200*1024))
+# pad for SD image size (including rootfs and bootloaders)
+size_img=$(($size_os + 1024*1024 + 300*1024))
+
+# create OS image
+sudo rm -f out/os.img
+sudo mkfs.fat -a -F32 -n "OS" -C out/os.img $size_os
+mkdir -p mnt
+sudo mount -o loop out/os.img mnt
+sudo cp -r os/* mnt/
+sudo umount mnt
+sudo ./mksdcard -p dragonboard410c/linux/installer.txt -s $size_img -i out -o db410c_sd_install_debian.img
+
+# create archive for publishing
+zip -j ${WORKSPACE}/out/dragonboard410c_sdcard_install_debian-${BUILD_NUMBER}.zip db410c_sd_install_debian.img ${WORKSPACE}/license.txt
+cd ..