From a91e76cd84e4a862d0462c8a30fbc9aeea8b923d Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Wed, 26 Nov 2025 14:07:56 +0800 Subject: [PATCH] [CI] clean up ci (#4452) 1. Run 4-card test only when single and 2-card test passed 2. rename file to make it more clear 3. remove useless pd workflow, it has been managed by nightly test already. - vLLM version: v0.11.2 - vLLM main: https://github.com/vllm-project/vllm/commit/v0.11.2 Signed-off-by: wangxiyuan --- .github/workflows/_e2e_test.yaml | 7 +- .github/workflows/vllm_ascend_test_pd.yaml | 112 ------------------ ...ull.yaml => vllm_ascend_test_pr_full.yaml} | 0 ...st.yaml => vllm_ascend_test_pr_light.yaml} | 0 4 files changed, 3 insertions(+), 116 deletions(-) delete mode 100644 .github/workflows/vllm_ascend_test_pd.yaml rename .github/workflows/{vllm_ascend_test_full.yaml => vllm_ascend_test_pr_full.yaml} (100%) rename .github/workflows/{vllm_ascend_test.yaml => vllm_ascend_test_pr_light.yaml} (100%) diff --git a/.github/workflows/_e2e_test.yaml b/.github/workflows/_e2e_test.yaml index 54e178d4..75c3d947 100644 --- a/.github/workflows/_e2e_test.yaml +++ b/.github/workflows/_e2e_test.yaml @@ -111,9 +111,6 @@ jobs: # Fix me: test_eagle_correctness OOM error pytest -sv tests/e2e/singlecard/spec_decode_v1/test_v1_spec_decode.py - # TODO: Move ops test to nightly test - #pytest -sv tests/e2e/singlecard/ops/ - e2e-2-cards: name: multicard-2 runs-on: ${{ inputs.runner }}-2 @@ -210,6 +207,8 @@ jobs: e2e-4-cards: name: multicard-4 + needs: [e2e, e2e-2-cards] + if: ${{ needs.e2e.result == 'success' && needs.e2e-2-cards.result == 'success' && inputs.type == 'full' }} runs-on: linux-aarch64-a3-4 container: image: m.daocloud.io/quay.io/ascend/cann:8.3.rc1-a3-ubuntu22.04-py3.11 @@ -289,4 +288,4 @@ jobs: VLLM_USE_MODELSCOPE: True run: | . /usr/local/Ascend/8.3.RC1/bisheng_toolkit/set_env.sh - pytest -sv tests/e2e/multicard/test_qwen3_next.py \ No newline at end of file + pytest -sv tests/e2e/multicard/test_qwen3_next.py diff --git a/.github/workflows/vllm_ascend_test_pd.yaml b/.github/workflows/vllm_ascend_test_pd.yaml deleted file mode 100644 index 97372a91..00000000 --- a/.github/workflows/vllm_ascend_test_pd.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# -# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved. -# This file is a part of the vllm-ascend project. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -name: 'e2e test / pd-disaggregation' - -on: - schedule: - # Runs at 23:00 UTC (7:00 AM Beijing) every day - - cron: '0 23 * * *' - pull_request: - types: [ labeled ] - -# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly -# declared as "shell: bash -el {0}" on steps that need to be properly activated. -# It's used to activate ascend-toolkit environment variables. -defaults: - run: - shell: bash -el {0} - -# only 1 job can runs on static-8-01-cards -concurrency: - group: static-8-01-cards - cancel-in-progress: false - -jobs: - prefilling-decoding-disaggregation: - # pd-test will be triggered when tag 'pd-test' & 'ready-for-test' or schedule job - if: ${{ contains(github.event.pull_request.labels.*.name, 'pd-test') && contains(github.event.pull_request.labels.*.name, 'ready-for-test') || github.event_name == 'schedule' }} - strategy: - matrix: - vllm_verison: [ - main, - v0.9.1 - ] - name: vLLM Ascend prefilling decoding disaggregation test - runs-on: linux-arm64-npu-static-8 - - container: - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.3.rc1-910b-ubuntu22.04-py3.11 - volumes: - - /usr/local/dcmi:/usr/local/dcmi - - /usr/local/bin/npu-smi:/usr/local/bin/npu-smi - - /usr/local/Ascend/driver/:/usr/local/Ascend/driver/ - # Use self-host cache speed up pip and model download - - /home/action/.cache:/github/home/.cache/ - options: >- - --device /dev/davinci0 - --device /dev/davinci1 - --device /dev/davinci_manager - --device /dev/devmm_svm - --device /dev/hisi_hdc - env: - VLLM_USE_MODELSCOPE: True - steps: - - name: Check npu and CANN info - run: | - npu-smi info - cat /usr/local/Ascend/ascend-toolkit/latest/"$(uname -i)"-linux/ascend_toolkit_install.info - - - name: Config mirrors - run: | - # keep using tuna's proxy since linux-arm64-npu-static-8 is in another region - sed -i 's|ports.ubuntu.com|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list - pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple - apt-get update -y - apt install git -y - git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/ - - - name: Checkout vllm-project/vllm-ascend repo - uses: actions/checkout@v6 - - - name: Install system dependencies - run: | - apt-get -y install `cat packages.txt` - apt-get -y install gcc g++ cmake libnuma-dev - - - name: Checkout vllm-project/vllm repo - uses: actions/checkout@v6 - with: - repository: vllm-project/vllm - ref: ${{ matrix.vllm_verison }} - path: ./vllm-empty - - - name: Install vllm-project/vllm from source - working-directory: ./vllm-empty - run: | - VLLM_TARGET_DEVICE=empty pip install -e . - - - name: Install vllm-project/vllm-ascend - env: - PIP_EXTRA_INDEX_URL: https://mirrors.huaweicloud.com/ascend/repos/pypi - run: | - pip install -r requirements-dev.txt - pip install -v -e . - - - name: Run vllm-project/vllm-ascend PD Disaggregation edge test - run: | - git config --global --add safe.directory/__w/vllm-ascend/vllm-ascend - bash tests/e2e/pd_disaggreate/run_edge_case_test.sh \ No newline at end of file diff --git a/.github/workflows/vllm_ascend_test_full.yaml b/.github/workflows/vllm_ascend_test_pr_full.yaml similarity index 100% rename from .github/workflows/vllm_ascend_test_full.yaml rename to .github/workflows/vllm_ascend_test_pr_full.yaml diff --git a/.github/workflows/vllm_ascend_test.yaml b/.github/workflows/vllm_ascend_test_pr_light.yaml similarity index 100% rename from .github/workflows/vllm_ascend_test.yaml rename to .github/workflows/vllm_ascend_test_pr_light.yaml