Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions buildkite/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,21 +183,33 @@ else
SKIP_IMAGE_BUILD=0
fi
fi
echo "Final SKIP_IMAGE_BUILD=${SKIP_IMAGE_BUILD} (RUN_ALL=${RUN_ALL}, VLLM_USE_PRECOMPILED=${VLLM_USE_PRECOMPILED:-unset})"

# Select Docker image based on latest common ancestor (LCA) commit between current branch and main
LCA_COMMIT=""
if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
LCA_COMMIT=$(git merge-base origin/main HEAD)
fi
if [[ -n "$LCA_COMMIT" ]]; then
DOCKER_IMAGE_OVERRIDE="public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:$LCA_COMMIT"
echo "Using Docker image for LCA commit: $DOCKER_IMAGE_OVERRIDE"
else
DOCKER_IMAGE_OVERRIDE="public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:latest"
echo "Could not determine LCA commit, using latest Docker image: $DOCKER_IMAGE_OVERRIDE"
# Determine the lowest common ancestor (LCA) commit with main branch if skipping image build
if [[ "${SKIP_IMAGE_BUILD}" == "1" ]]; then
LCA_COMMIT=""
if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
LCA_COMMIT=$(git merge-base origin/main HEAD)
fi
if [[ -n "$LCA_COMMIT" ]]; then
IMAGE_TAG="public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:$LCA_COMMIT"
echo "IMAGE_TAG: $IMAGE_TAG"
# Check if the image exists on the registry
if [[ -z $(docker manifest inspect "$IMAGE_TAG") ]]; then
echo "LCA image not found, falling back to build image"
SKIP_IMAGE_BUILD=0
VLLM_USE_PRECOMPILED=0
else
DOCKER_IMAGE_OVERRIDE="$IMAGE_TAG"
echo "Using Docker image for LCA commit: $DOCKER_IMAGE_OVERRIDE"
fi
else
DOCKER_IMAGE_OVERRIDE="public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:latest"
echo "Could not determine LCA commit, using latest Docker image: $DOCKER_IMAGE_OVERRIDE"
fi
fi

echo "Final SKIP_IMAGE_BUILD=${SKIP_IMAGE_BUILD} (RUN_ALL=${RUN_ALL}, VLLM_USE_PRECOMPILED=${VLLM_USE_PRECOMPILED:-unset})"

################## end WIP #####################

LIST_FILE_DIFF=$(get_diff | tr ' ' '|')
Expand Down