Skip to content
Merged
Changes from 8 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
14 changes: 6 additions & 8 deletions .buildkite/scripts/setup_docker_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ setup_environment() {
# shellcheck disable=1091
source /etc/environment

if [ -z "${BUILDKITE_COMMIT:-}" ]; then
echo "ERROR: BUILDKITE_COMMIT environment variable is not set." >&2
echo "This script expects BUILDKITE_COMMIT to tag the Docker image." >&2
exit 1
fi

# Cleanup of existing containers and images.
echo "Starting cleanup for ${IMAGE_NAME}..."
# Get all unique image IDs for the repository
Expand Down Expand Up @@ -58,8 +52,12 @@ setup_environment() {
echo "Installing Python dependencies"
python3 -m pip install --progress-bar off buildkite-test-collector==0.1.9
echo "Python dependencies installed"

VLLM_COMMIT_HASH=$(buildkite-agent meta-data get "VLLM_COMMIT_HASH" --default "")
if [ -z "${BUILDKITE:-}" ]; then
VLLM_COMMIT_HASH=""
BUILDKITE_COMMIT=$(git log -n 1 --pretty="%H")
else
VLLM_COMMIT_HASH=$(buildkite-agent meta-data get "VLLM_COMMIT_HASH" --default "")
fi

docker build \
--build-arg VLLM_COMMIT_HASH="${VLLM_COMMIT_HASH}" \
Expand Down