From 43e970bcc9981d7eca80bbb0cc242e93ed54b126 Mon Sep 17 00:00:00 2001 From: khluu Date: Fri, 20 Feb 2026 13:19:15 -0800 Subject: [PATCH] p Signed-off-by: khluu --- .buildkite/image_build/image_build.sh | 14 ++++---------- .buildkite/image_build/image_build.yaml | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.buildkite/image_build/image_build.sh b/.buildkite/image_build/image_build.sh index f0bbaab7751..9cde930e01e 100755 --- a/.buildkite/image_build/image_build.sh +++ b/.buildkite/image_build/image_build.sh @@ -8,7 +8,7 @@ clean_docker_tag() { } print_usage_and_exit() { - echo "Usage: $0 " + echo "Usage: $0 []" exit 1 } @@ -154,7 +154,7 @@ print_bake_config() { ################################# print_instance_info -if [[ $# -lt 7 ]]; then +if [[ $# -lt 5 ]]; then print_usage_and_exit fi @@ -163,10 +163,8 @@ REGISTRY=$1 REPO=$2 BUILDKITE_COMMIT=$3 BRANCH=$4 -VLLM_USE_PRECOMPILED=$5 -VLLM_MERGE_BASE_COMMIT=$6 -IMAGE_TAG=$7 -IMAGE_TAG_LATEST=${8:-} # only used for main branch, optional +IMAGE_TAG=$5 +IMAGE_TAG_LATEST=${6:-} # only used for main branch, optional # build config TARGET="test-ci" @@ -193,8 +191,6 @@ export CACHE_FROM export CACHE_FROM_BASE_BRANCH export CACHE_FROM_MAIN export CACHE_TO -export VLLM_USE_PRECOMPILED -export VLLM_MERGE_BASE_COMMIT # print args echo "--- :mag: Arguments" @@ -202,8 +198,6 @@ echo "REGISTRY: ${REGISTRY}" echo "REPO: ${REPO}" echo "BUILDKITE_COMMIT: ${BUILDKITE_COMMIT}" echo "BRANCH: ${BRANCH}" -echo "VLLM_USE_PRECOMPILED: ${VLLM_USE_PRECOMPILED}" -echo "VLLM_MERGE_BASE_COMMIT: ${VLLM_MERGE_BASE_COMMIT}" echo "IMAGE_TAG: ${IMAGE_TAG}" echo "IMAGE_TAG_LATEST: ${IMAGE_TAG_LATEST}" diff --git a/.buildkite/image_build/image_build.yaml b/.buildkite/image_build/image_build.yaml index 163dd68c85f..e66576639ae 100644 --- a/.buildkite/image_build/image_build.yaml +++ b/.buildkite/image_build/image_build.yaml @@ -4,8 +4,8 @@ steps: key: image-build depends_on: [] commands: - - if [[ "$BUILDKITE_BRANCH" != "main" ]]; then .buildkite/image_build/image_build.sh $REGISTRY $REPO $BUILDKITE_COMMIT $BRANCH $VLLM_USE_PRECOMPILED $VLLM_MERGE_BASE_COMMIT $IMAGE_TAG; fi - - if [[ "$BUILDKITE_BRANCH" == "main" ]]; then .buildkite/image_build/image_build.sh $REGISTRY $REPO $BUILDKITE_COMMIT $BRANCH $VLLM_USE_PRECOMPILED $VLLM_MERGE_BASE_COMMIT $IMAGE_TAG $IMAGE_TAG_LATEST; fi + - if [[ "$BUILDKITE_BRANCH" != "main" ]]; then .buildkite/image_build/image_build.sh $REGISTRY $REPO $BUILDKITE_COMMIT $BRANCH $IMAGE_TAG; fi + - if [[ "$BUILDKITE_BRANCH" == "main" ]]; then .buildkite/image_build/image_build.sh $REGISTRY $REPO $BUILDKITE_COMMIT $BRANCH $IMAGE_TAG $IMAGE_TAG_LATEST; fi retry: automatic: - exit_status: -1 # Agent was lost