Skip to content

Commit 0f92a23

Browse files
committed
use self_hosted
Signed-off-by: wangli <[email protected]>
1 parent fe3f2c7 commit 0f92a23

File tree

2 files changed

+53
-60
lines changed

2 files changed

+53
-60
lines changed

.github/workflows/_pre_commit.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ permissions:
1212

1313
jobs:
1414
pre-commit:
15-
runs-on: ubuntu-latest
15+
runs-on: linux-amd64-cpu-16
16+
container:
17+
image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/vllm-ascend:nightly-cpu
1618
steps:
1719
- name: Checkout vllm-project/vllm-ascend repo
1820
uses: actions/checkout@v6
19-
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
20-
with:
21-
python-version: "3.11"
2221
- run: echo "::add-matcher::.github/workflows/matchers/actionlint.json"
2322
- run: echo "::add-matcher::.github/workflows/matchers/mypy.json"
2423
- name: Checkout vllm-project/vllm repo

.github/workflows/pr_test_light.yaml

Lines changed: 50 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -43,47 +43,47 @@ jobs:
4343
uses: ./.github/workflows/_pre_commit.yml
4444
with:
4545
vllm: 2f4e6548efec402b913ffddc8726230d9311948d
46-
changes:
47-
runs-on: linux-aarch64-a2-0
48-
outputs:
49-
e2e_tracker: ${{ steps.filter.outputs.e2e_tracker }}
50-
ut_tracker: ${{ steps.filter.outputs.ut_tracker }}
51-
steps:
52-
- name: Setup git proxy
53-
run: |
54-
git config --global --add safe.directory "$GITHUB_WORKSPACE"
55-
git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/
56-
# NOTE: Do not update the version of checkout, there have some issue on self_hosted runner with the higher version
57-
- uses: actions/checkout@v6
58-
- uses: dorny/paths-filter@v3
59-
id: filter
60-
with:
61-
filters: |
62-
e2e_tracker:
63-
- '.github/workflows/pr_test_light.yaml'
64-
- 'vllm_ascend/**'
65-
- 'csrc/**'
66-
- 'cmake/**'
67-
- 'tests/e2e/**'
68-
- 'CMakeLists.txt'
69-
- 'setup.py'
70-
- 'requirements.txt'
71-
- 'requirements-dev.txt'
72-
- 'requirements-lint.txt'
73-
- 'packages.txt'
74-
ut_tracker:
75-
- 'tests/ut/**'
76-
- '.github/workflows/vllm_ascend_test_pr_light.yaml'
46+
# changes:
47+
# runs-on: linux-aarch64-a2-0
48+
# outputs:
49+
# e2e_tracker: ${{ steps.filter.outputs.e2e_tracker }}
50+
# ut_tracker: ${{ steps.filter.outputs.ut_tracker }}
51+
# steps:
52+
# - name: Setup git proxy
53+
# run: |
54+
# git config --global --add safe.directory "$GITHUB_WORKSPACE"
55+
# git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/
56+
# # NOTE: Do not update the version of checkout, there have some issue on self_hosted runner with the higher version
57+
# - uses: actions/checkout@v6
58+
# - uses: dorny/paths-filter@v3
59+
# id: filter
60+
# with:
61+
# filters: |
62+
# e2e_tracker:
63+
# - '.github/workflows/pr_test_light.yaml'
64+
# - 'vllm_ascend/**'
65+
# - 'csrc/**'
66+
# - 'cmake/**'
67+
# - 'tests/e2e/**'
68+
# - 'CMakeLists.txt'
69+
# - 'setup.py'
70+
# - 'requirements.txt'
71+
# - 'requirements-dev.txt'
72+
# - 'requirements-lint.txt'
73+
# - 'packages.txt'
74+
# ut_tracker:
75+
# - 'tests/ut/**'
76+
# - '.github/workflows/vllm_ascend_test_pr_light.yaml'
7777

7878
ut:
79-
needs: [lint, changes]
79+
#needs: [lint, changes]
8080
name: unit test
8181
# only trigger unit test after lint passed and the change is e2e and ut related.
82-
if: ${{ needs.lint.result == 'success' && (needs.changes.outputs.e2e_tracker == 'true' || needs.changes.outputs.ut_tracker == 'true') }}
83-
runs-on: ubuntu-22.04-arm
82+
#if: ${{ needs.lint.result == 'success' && (needs.changes.outputs.e2e_tracker == 'true' || needs.changes.outputs.ut_tracker == 'true') }}
83+
runs-on: linux-amd64-cpu-8
8484
container:
8585
# fixme: vllm-ascend install failed with 8.3.rc2 on github action
86-
image: quay.io/ascend/cann:8.2.rc2-910b-ubuntu22.04-py3.11
86+
image: quay.nju.edu.cn/ascend/cann:8.2.rc2-910b-ubuntu22.04-py3.11
8787
env:
8888
VLLM_LOGGING_LEVEL: ERROR
8989
VLLM_USE_MODELSCOPE: True
@@ -93,12 +93,6 @@ jobs:
9393
vllm_version: [2f4e6548efec402b913ffddc8726230d9311948d, v0.13.0]
9494

9595
steps:
96-
- name: Free up disk space
97-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
98-
with:
99-
tool-cache: true
100-
docker-images: false
101-
10296
- name: Install packages
10397
run: |
10498
apt-get update -y
@@ -159,18 +153,18 @@ jobs:
159153
name: vllm-ascend
160154
verbose: true
161155

162-
e2e-light:
163-
name: e2e-light
164-
strategy:
165-
matrix:
166-
vllm_version: [2f4e6548efec402b913ffddc8726230d9311948d, v0.13.0]
167-
# Note (yikun): If CI resource are limited we can split job into two chain jobs
168-
needs: [lint, changes]
169-
# only trigger e2e test after lint passed and the change is e2e related with pull request.
170-
if: ${{ github.event_name == 'pull_request' && needs.lint.result == 'success' && needs.changes.outputs.e2e_tracker == 'true' && !contains(github.event.pull_request.labels.*.name, 'ready') }}
171-
uses: ./.github/workflows/_e2e_test.yaml
172-
with:
173-
vllm: ${{ matrix.vllm_version }}
174-
runner: linux-aarch64-a2
175-
image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.3.rc2-910b-ubuntu22.04-py3.11
176-
type: light
156+
# e2e-light:
157+
# name: e2e-light
158+
# strategy:
159+
# matrix:
160+
# vllm_version: [2f4e6548efec402b913ffddc8726230d9311948d, v0.13.0]
161+
# # Note (yikun): If CI resource are limited we can split job into two chain jobs
162+
# needs: [lint, changes]
163+
# # only trigger e2e test after lint passed and the change is e2e related with pull request.
164+
# if: ${{ github.event_name == 'pull_request' && needs.lint.result == 'success' && needs.changes.outputs.e2e_tracker == 'true' && !contains(github.event.pull_request.labels.*.name, 'ready') }}
165+
# uses: ./.github/workflows/_e2e_test.yaml
166+
# with:
167+
# vllm: ${{ matrix.vllm_version }}
168+
# runner: linux-aarch64-a2
169+
# image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.3.rc2-910b-ubuntu22.04-py3.11
170+
# type: light

0 commit comments

Comments
 (0)