From 4dc52e1c53b4ab06ec4d6c92791a4de0718abb70 Mon Sep 17 00:00:00 2001 From: "Kevin H. Luu" Date: Fri, 4 Apr 2025 12:16:20 -0700 Subject: [PATCH] [CI] Reorganize .buildkite directory (#16001) Signed-off-by: kevin --- .buildkite/release-pipeline.yaml | 6 +++--- .buildkite/{ => scripts/hardware_ci}/run-amd-test.sh | 0 .../{ => scripts/hardware_ci}/run-cpu-test-ppc64le.sh | 0 .buildkite/{ => scripts/hardware_ci}/run-cpu-test.sh | 0 .buildkite/{ => scripts/hardware_ci}/run-gh200-test.sh | 0 .buildkite/{ => scripts/hardware_ci}/run-hpu-test.sh | 0 .buildkite/{ => scripts/hardware_ci}/run-neuron-test.sh | 0 .buildkite/{ => scripts/hardware_ci}/run-tpu-v1-test.sh | 0 .buildkite/{ => scripts/hardware_ci}/run-xpu-test.sh | 0 .buildkite/{ => scripts}/run-benchmarks.sh | 0 .buildkite/{ => scripts}/run-multi-node-test.sh | 2 +- .buildkite/{ => scripts}/upload-wheels.sh | 0 .buildkite/test-pipeline.yaml | 2 +- tools/shellcheck.sh | 4 ++-- 14 files changed, 7 insertions(+), 7 deletions(-) rename .buildkite/{ => scripts/hardware_ci}/run-amd-test.sh (100%) rename .buildkite/{ => scripts/hardware_ci}/run-cpu-test-ppc64le.sh (100%) rename .buildkite/{ => scripts/hardware_ci}/run-cpu-test.sh (100%) rename .buildkite/{ => scripts/hardware_ci}/run-gh200-test.sh (100%) rename .buildkite/{ => scripts/hardware_ci}/run-hpu-test.sh (100%) rename .buildkite/{ => scripts/hardware_ci}/run-neuron-test.sh (100%) rename .buildkite/{ => scripts/hardware_ci}/run-tpu-v1-test.sh (100%) rename .buildkite/{ => scripts/hardware_ci}/run-xpu-test.sh (100%) rename .buildkite/{ => scripts}/run-benchmarks.sh (100%) rename .buildkite/{ => scripts}/run-multi-node-test.sh (96%) rename .buildkite/{ => scripts}/upload-wheels.sh (100%) diff --git a/.buildkite/release-pipeline.yaml b/.buildkite/release-pipeline.yaml index a420759a..3354ea37 100644 --- a/.buildkite/release-pipeline.yaml +++ b/.buildkite/release-pipeline.yaml @@ -6,7 +6,7 @@ steps: - "DOCKER_BUILDKIT=1 docker build --build-arg max_jobs=16 --build-arg USE_SCCACHE=1 --build-arg GIT_REPO_CHECK=1 --build-arg CUDA_VERSION=12.4.0 --tag vllm-ci:build-image --target build --progress plain -f docker/Dockerfile ." - "mkdir artifacts" - "docker run --rm -v $(pwd)/artifacts:/artifacts_host vllm-ci:build-image bash -c 'cp -r dist /artifacts_host && chmod -R a+rw /artifacts_host'" - - "bash .buildkite/upload-wheels.sh" + - "bash .buildkite/scripts/upload-wheels.sh" env: DOCKER_BUILDKIT: "1" @@ -17,7 +17,7 @@ steps: - "DOCKER_BUILDKIT=1 docker build --build-arg max_jobs=16 --build-arg USE_SCCACHE=1 --build-arg GIT_REPO_CHECK=1 --build-arg CUDA_VERSION=12.1.0 --tag vllm-ci:build-image --target build --progress plain -f docker/Dockerfile ." - "mkdir artifacts" - "docker run --rm -v $(pwd)/artifacts:/artifacts_host vllm-ci:build-image bash -c 'cp -r dist /artifacts_host && chmod -R a+rw /artifacts_host'" - - "bash .buildkite/upload-wheels.sh" + - "bash .buildkite/scripts/upload-wheels.sh" env: DOCKER_BUILDKIT: "1" @@ -34,7 +34,7 @@ steps: - "DOCKER_BUILDKIT=1 docker build --build-arg max_jobs=16 --build-arg USE_SCCACHE=1 --build-arg GIT_REPO_CHECK=1 --build-arg CUDA_VERSION=11.8.0 --tag vllm-ci:build-image --target build --progress plain -f docker/Dockerfile ." - "mkdir artifacts" - "docker run --rm -v $(pwd)/artifacts:/artifacts_host vllm-ci:build-image bash -c 'cp -r dist /artifacts_host && chmod -R a+rw /artifacts_host'" - - "bash .buildkite/upload-wheels.sh" + - "bash .buildkite/scripts/upload-wheels.sh" env: DOCKER_BUILDKIT: "1" diff --git a/.buildkite/run-amd-test.sh b/.buildkite/scripts/hardware_ci/run-amd-test.sh similarity index 100% rename from .buildkite/run-amd-test.sh rename to .buildkite/scripts/hardware_ci/run-amd-test.sh diff --git a/.buildkite/run-cpu-test-ppc64le.sh b/.buildkite/scripts/hardware_ci/run-cpu-test-ppc64le.sh similarity index 100% rename from .buildkite/run-cpu-test-ppc64le.sh rename to .buildkite/scripts/hardware_ci/run-cpu-test-ppc64le.sh diff --git a/.buildkite/run-cpu-test.sh b/.buildkite/scripts/hardware_ci/run-cpu-test.sh similarity index 100% rename from .buildkite/run-cpu-test.sh rename to .buildkite/scripts/hardware_ci/run-cpu-test.sh diff --git a/.buildkite/run-gh200-test.sh b/.buildkite/scripts/hardware_ci/run-gh200-test.sh similarity index 100% rename from .buildkite/run-gh200-test.sh rename to .buildkite/scripts/hardware_ci/run-gh200-test.sh diff --git a/.buildkite/run-hpu-test.sh b/.buildkite/scripts/hardware_ci/run-hpu-test.sh similarity index 100% rename from .buildkite/run-hpu-test.sh rename to .buildkite/scripts/hardware_ci/run-hpu-test.sh diff --git a/.buildkite/run-neuron-test.sh b/.buildkite/scripts/hardware_ci/run-neuron-test.sh similarity index 100% rename from .buildkite/run-neuron-test.sh rename to .buildkite/scripts/hardware_ci/run-neuron-test.sh diff --git a/.buildkite/run-tpu-v1-test.sh b/.buildkite/scripts/hardware_ci/run-tpu-v1-test.sh similarity index 100% rename from .buildkite/run-tpu-v1-test.sh rename to .buildkite/scripts/hardware_ci/run-tpu-v1-test.sh diff --git a/.buildkite/run-xpu-test.sh b/.buildkite/scripts/hardware_ci/run-xpu-test.sh similarity index 100% rename from .buildkite/run-xpu-test.sh rename to .buildkite/scripts/hardware_ci/run-xpu-test.sh diff --git a/.buildkite/run-benchmarks.sh b/.buildkite/scripts/run-benchmarks.sh similarity index 100% rename from .buildkite/run-benchmarks.sh rename to .buildkite/scripts/run-benchmarks.sh diff --git a/.buildkite/run-multi-node-test.sh b/.buildkite/scripts/run-multi-node-test.sh similarity index 96% rename from .buildkite/run-multi-node-test.sh rename to .buildkite/scripts/run-multi-node-test.sh index 530bf90a..49aebce7 100755 --- a/.buildkite/run-multi-node-test.sh +++ b/.buildkite/scripts/run-multi-node-test.sh @@ -3,7 +3,7 @@ set -euox pipefail if [[ $# -lt 4 ]]; then - echo "Usage: .buildkite/run-multi-node-test.sh WORKING_DIR NUM_NODES NUM_GPUS DOCKER_IMAGE COMMAND1 COMMAND2 ... COMMANDN" + echo "Usage: .buildkite/scripts/run-multi-node-test.sh WORKING_DIR NUM_NODES NUM_GPUS DOCKER_IMAGE COMMAND1 COMMAND2 ... COMMANDN" exit 1 fi diff --git a/.buildkite/upload-wheels.sh b/.buildkite/scripts/upload-wheels.sh similarity index 100% rename from .buildkite/upload-wheels.sh rename to .buildkite/scripts/upload-wheels.sh diff --git a/.buildkite/test-pipeline.yaml b/.buildkite/test-pipeline.yaml index 4a462e19..0b775851 100644 --- a/.buildkite/test-pipeline.yaml +++ b/.buildkite/test-pipeline.yaml @@ -337,7 +337,7 @@ steps: source_file_dependencies: - benchmarks/ commands: - - bash run-benchmarks.sh + - bash scripts/run-benchmarks.sh - label: Quantization Test # 33min source_file_dependencies: diff --git a/tools/shellcheck.sh b/tools/shellcheck.sh index 7efb3cab..59ce4003 100755 --- a/tools/shellcheck.sh +++ b/tools/shellcheck.sh @@ -18,5 +18,5 @@ if ! [ -x "$(command -v shellcheck)" ]; then export PATH="$PATH:$(pwd)/shellcheck-${scversion}" fi -# TODO - fix warnings in .buildkite/run-amd-test.sh -find . -name "*.sh" ".git" -prune -not -path "./.buildkite/run-amd-test.sh" -print0 | xargs -0 -I {} sh -c 'git check-ignore -q "{}" || shellcheck -s bash "{}"' +# TODO - fix warnings in .buildkite/scripts/hardware_ci/run-amd-test.sh +find . -name "*.sh" ".git" -prune -not -path "./.buildkite/scripts/hardware_ci/run-amd-test.sh" -print0 | xargs -0 -I {} sh -c 'git check-ignore -q "{}" || shellcheck -s bash "{}"'