From 5641db010c360d415d39e3038e0233f9546d5b1b Mon Sep 17 00:00:00 2001 From: Johan Gunnarsson Date: Tue, 2 Aug 2022 19:38:10 +0200 Subject: [PATCH] build-*-with-aws-batch: Download args to temp file --- scripts/build-boot-with-aws-batch | 7 +++++-- scripts/build-debian-with-aws-batch | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/build-boot-with-aws-batch b/scripts/build-boot-with-aws-batch index 1132cf0..ce87025 100755 --- a/scripts/build-boot-with-aws-batch +++ b/scripts/build-boot-with-aws-batch @@ -6,11 +6,14 @@ ARTIFACTS_S3_URI_BASE="${2}" # For example "s3://bucket/folder" set -ex +ARGS=$(mktemp --tmpdir args-XXXXXX.sh) +trap 'rm -f "${ARGS}"' EXIT INT TERM + # Download parameters for this run -aws s3 cp "${ARRAY_S3_URI_BASE}/${AWS_BATCH_JOB_ARRAY_INDEX}" args +aws s3 cp "${ARRAY_S3_URI_BASE}/${AWS_BATCH_JOB_ARRAY_INDEX}" "${ARGS}" # Source parameters -. args +. "${ARGS}" build-boot "${BOARD_ID}" "${CHIP_ID}" "${DEFCONFIG}" "${TUPLE}" diff --git a/scripts/build-debian-with-aws-batch b/scripts/build-debian-with-aws-batch index 46dbcc7..e292e49 100755 --- a/scripts/build-debian-with-aws-batch +++ b/scripts/build-debian-with-aws-batch @@ -6,11 +6,14 @@ ARTIFACTS_S3_URI_BASE="${2}" # For example "s3://bucket/folder" set -ex +ARGS=$(mktemp --tmpdir args-XXXXXX.sh) +trap 'rm -f "${ARGS}"' EXIT INT TERM + # Download parameters for this run -aws s3 cp "${ARRAY_S3_URI_BASE}/${AWS_BATCH_JOB_ARRAY_INDEX}" args +aws s3 cp "${ARRAY_S3_URI_BASE}/${AWS_BATCH_JOB_ARRAY_INDEX}" "${ARGS}" # Source parameters -. args +. "${ARGS}" build-debian "${OS}" "${ARCH}" "${DIST}"