From 1e43ba11d38ec8277ab7c27498efa3535da433b6 Mon Sep 17 00:00:00 2001 From: driazati Date: Thu, 30 Jun 2022 13:46:28 -0700 Subject: [PATCH] [docker] Fall back to tlcpackstaging in bash.sh This uses #11775 to make local builds work if they're run in the meantime before CI tags over a new image to tlcpack --- docker/bash.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docker/bash.sh b/docker/bash.sh index 18c655d2ddc5..56efa1d04551 100755 --- a/docker/bash.sh +++ b/docker/bash.sh @@ -290,7 +290,15 @@ DOCKER_DEVICES=( ) # If the user gave a shortcut defined in the Jenkinsfile, use it. EXPANDED_SHORTCUT=$(lookup_image_spec "${DOCKER_IMAGE_NAME}") if [ -n "${EXPANDED_SHORTCUT}" ]; then - DOCKER_IMAGE_NAME="${EXPANDED_SHORTCUT}" + if [ "${CI+x}" == "true" ]; then + DOCKER_IMAGE_NAME="${EXPANDED_SHORTCUT}" + else + python tests/scripts/determine_docker_images.py "$DOCKER_IMAGE_NAME=$EXPANDED_SHORTCUT" 2> /dev/null + DOCKER_IMAGE_NAME=$(cat ".docker-image-names/$DOCKER_IMAGE_NAME") + if [[ "$DOCKER_IMAGE_NAME" == *"tlcpackstaging"* ]]; then + echo "WARNING: resolved docker image to fallback tag in tlcpackstaging" >&2 + fi + fi fi # Set up working directories