jenkins_build.sh: Add building and deployment of blocks

If blocks are defined in the job, build and deploy them.

Change-type: patch
Signed-off-by: Alex Gonzalez <[email protected]>

Author: alexgg

automation/jenkins_build.sh

@@ -158,13 +158,35 @@ else
 	popd > /dev/null 2>&1
 fi
 
-"${automation_dir}"/../build/balena-build.sh -d "${MACHINE}" -s "${JENKINS_PERSISTENT_WORKDIR}" -a "$(balena_lib_environment)" -v "${buildFlavor}" -g "${BARYS_ARGUMENTS_VAR}"
+# Artifacts
+
+# Build hostapp
+"${automation_dir}"/../build/balena-build.sh -d "${MACHINE}" -s "${JENKINS_PERSISTENT_WORKDIR}" -a "$(balena_lib_environment)" -v "${buildFlavor}" -g "${BARYS_ARGUMENTS_VAR}" -b "-c image_docker" -i "balena-image"
 
 image_path=$(find "${WORKSPACE}/build/tmp/work/" -name "balena-image-${MACHINE}*.docker" -type l)
 if [ -L "${_image_path}" ]; then
 	echo "[ERROR]:balena_deploy_hostapp: No hostapp to release"
 	exit 1
 fi
+balena_deploy_block "$(balena_lib_get_slug "${MACHINE}")" "${MACHINE}" "${_bootable:-1}" "${deploy}" "${image_path}"
+
+# Build and release blocks
+if [ -n "${blocks}" ]; then
+	[ "${deploy}" = "no" ] && _final=""
+	"${automation_dir}/jenkins_build-blocks.sh" -d "${MACHINE}" -a "$(balena_lib_environment)" -b "${blocks}" -t "$(balena_lib_token)" -v "${buildFlavor}" -s "${JENKINS_PERSISTENT_WORKDIR}" "${_final:+"-p"}"
+fi
+
+# Release hostos
+osapp="${MACHINE}-hostos"
+blocks_apps="${MACHINE}"
+for block in ${blocks}; do
+	blocks_apps="${blocks_apps} ${MACHINE}-${block}"
+done
+balena_deploy_hostos "${osapp}" "${blocks_apps}" "${MACHINE}" "${deploy}"
+BARYS_ARGUMENTS_VAR="${BARYS_ARGUMENTS_VAR} -a HOSTOS_APPS=${osapp}"
+
+# Build image
+"${automation_dir}"/../build/balena-build.sh -d "${MACHINE}" -s "${JENKINS_PERSISTENT_WORKDIR}" -a "$(balena_lib_environment)" -v "${buildFlavor}" -g "${BARYS_ARGUMENTS_VAR}"
 
 if [ "$ENABLE_TESTS" = true ]; then
 	# Run the test script in the device specific repository
@@ -186,7 +208,6 @@ if [ "$deploy" = "yes" ]; then
 
 	balena_deploy_to_s3 "$MACHINE" "${buildFlavor}" "${ESR}" "${deployTo}"
 	balena_deploy_to_dockerhub "${MACHINE}"
-	balena_deploy_block "$(balena_lib_get_slug "${MACHINE}")" "${MACHINE}" "${_bootable:-1}" "${deploy}" "${image_path}"
 
 	if [ "$AMI" = "true" ]; then
 		echo "[INFO] Generating AMI"