From 407f4063007bbe5164a6d9a93f6f93b360230273 Mon Sep 17 00:00:00 2001 From: Andreas Karatzas Date: Thu, 2 Jul 2026 19:45:23 -0500 Subject: [PATCH] [ROCm][CI] Adding metadata (#47477) Signed-off-by: Andreas Karatzas --- .buildkite/test-amd.yaml | 22 +++++++++++++++ docker/Dockerfile.rocm | 12 ++++++++ .../tools/test_docker_build_metadata_args.py | 28 +++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/.buildkite/test-amd.yaml b/.buildkite/test-amd.yaml index 075ac65d7a..193fe9de2a 100644 --- a/.buildkite/test-amd.yaml +++ b/.buildkite/test-amd.yaml @@ -404,6 +404,28 @@ steps: - pytest -v -s transformers_utils - pytest -v -s config +#----------------------------------------------------------- mi250 ยท docker ----------------------------------------------------------# + +- label: Docker Build Metadata (ROCm) # TBD + timeout_in_minutes: 20 + mirror_hardwares: [amdexperimental, amdproduction, amdgfx90anightly, amdmi250] + agent_pool: mi250_1 + no_gpu: true + working_dir: "/vllm-workspace/tests" + source_file_dependencies: + - .buildkite/scripts/docker-build-metadata-args.sh + - .buildkite/scripts/ci-bake-rocm.sh + - docker/Dockerfile + - docker/Dockerfile.cpu + - docker/Dockerfile.rocm + - docker/Dockerfile.rocm_base + - docker/ci-rocm.hcl + - docker/docker-bake.hcl + - docker/docker-bake-rocm.hcl + - tests/tools/test_docker_build_metadata_args.py + commands: + - pytest -v -s tools/test_docker_build_metadata_args.py + ######################################################################################################################################### # # # MI300 (gfx942) tests # diff --git a/docker/Dockerfile.rocm b/docker/Dockerfile.rocm index c17444217f..b4fed26b0d 100644 --- a/docker/Dockerfile.rocm +++ b/docker/Dockerfile.rocm @@ -231,7 +231,13 @@ COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/benchmarks /benchmarks COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/tests /tests COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/examples /examples COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/tools/install_torchcodec_rocm.sh /tools/install_torchcodec_rocm.sh +COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/docker/Dockerfile /docker/Dockerfile +COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/docker/Dockerfile.cpu /docker/Dockerfile.cpu COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/docker/Dockerfile.rocm /docker/ +COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/docker/Dockerfile.rocm_base /docker/Dockerfile.rocm_base +COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/docker/ci-rocm.hcl /docker/ci-rocm.hcl +COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/docker/docker-bake.hcl /docker/docker-bake.hcl +COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/docker/docker-bake-rocm.hcl /docker/docker-bake-rocm.hcl COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/.buildkite /.buildkite COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/pyproject.toml /pyproject.toml COPY --from=build_vllm ${COMMON_WORKDIR}/vllm/vllm/v1 /vllm_v1 @@ -516,7 +522,13 @@ COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/benchmarks /benchmar COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/tests /tests COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/examples /examples COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/tools/install_torchcodec_rocm.sh /tools/install_torchcodec_rocm.sh +COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/docker/Dockerfile /docker/Dockerfile +COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/docker/Dockerfile.cpu /docker/Dockerfile.cpu COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/docker/Dockerfile.rocm /docker/ +COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/docker/Dockerfile.rocm_base /docker/Dockerfile.rocm_base +COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/docker/ci-rocm.hcl /docker/ci-rocm.hcl +COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/docker/docker-bake.hcl /docker/docker-bake.hcl +COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/docker/docker-bake-rocm.hcl /docker/docker-bake-rocm.hcl COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/.buildkite /.buildkite COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/pyproject.toml /pyproject.toml COPY --from=build_vllm_wheel_release ${COMMON_WORKDIR}/vllm/vllm/v1 /vllm_v1 diff --git a/tests/tools/test_docker_build_metadata_args.py b/tests/tools/test_docker_build_metadata_args.py index fa2eac558f..72d4ad8089 100644 --- a/tests/tools/test_docker_build_metadata_args.py +++ b/tests/tools/test_docker_build_metadata_args.py @@ -150,3 +150,31 @@ def test_vllm_openai_image_embeds_metadata_contract() -> None: 'ai.vllm.image.tag="${VLLM_IMAGE_TAG}"', ): assert expected in dockerfile + + +def test_rocm_ci_base_bake_embeds_content_hash_label() -> None: + bake_file = (REPO_ROOT / "docker" / "docker-bake-rocm.hcl").read_text() + + for expected in ( + 'variable "CI_BASE_CONTENT_HASH"', + 'target "ci-base-rocm"', + 'target = "ci_base"', + '"vllm.ci_base.content_hash" = CI_BASE_CONTENT_HASH', + ): + assert expected in bake_file + + +def test_rocm_ci_base_metadata_inputs_cover_ci_base_files() -> None: + ci_bake = (REPO_ROOT / ".buildkite" / "scripts" / "ci-bake-rocm.sh").read_text() + + for expected in ( + "requirements/common.txt", + "requirements/rocm.txt", + "requirements/test/rocm.txt", + "docker/Dockerfile.rocm_base", + "docker/Dockerfile.rocm", + "docker/ci-rocm.hcl", + "docker/docker-bake-rocm.hcl", + ".buildkite/scripts/ci-bake-rocm.sh", + ): + assert expected in ci_bake