From b855963046f9a69e211a96e38f18dd13af643ede Mon Sep 17 00:00:00 2001 From: Davlet Panech Date: Tue, 7 Jun 2022 15:33:03 -0400 Subject: [PATCH] build-stx-images.sh: fail on missing build recipes The script build-stx-images.sh ignores missing docker_image files, hiding errors such as https://review.opendev.org/c/starlingx/oidc-auth-armada-app/+/845020 . Add error handling for this case. TESTS ========================= (1) Add a non-existent directory in one of the centos_stable_docker_images.inc and run build-stx-images.sh. Make sure it fails. (2) Remove non-existant directories from (1) & make sure build-stx-images.sh does not fail. Task: 2010074 Story: 45560 Depends-On: https://review.opendev.org/c/starlingx/oidc-auth-armada-app/+/845020 Signed-off-by: Davlet Panech Change-Id: I5e3fb79b3105c7574c424130def3e6f052f69d17 --- build-tools/build-docker-images/build-stx-images.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build-tools/build-docker-images/build-stx-images.sh b/build-tools/build-docker-images/build-stx-images.sh index ca14b170..0e529846 100755 --- a/build-tools/build-docker-images/build-stx-images.sh +++ b/build-tools/build-docker-images/build-stx-images.sh @@ -975,6 +975,13 @@ function find_image_build_files { for image_build_dir in $(sed -e 's/#.*//' ${image_build_inc_file} | sort -u); do for image_build_file in ${basedir}/${image_build_dir}/${OS}/*.${BUILD_STREAM}_docker_image; do + # Make sure image exists + if [[ ! -f "$image_build_file" ]] ; then + echo "ERROR: $image_build_file: file not found" >&2 + echo "ERROR: $image_build_inc_file: referenced here" >&2 + exit 1 + fi + # reset & read image build directive vars local BUILDER= local PROJECT=