Skip to content

Commit 6537533

Browse files
sirutBuasaisirutBuasai
committed
reduce if condition for vllm
Signed-off-by: sirutBuasai <sirutbuasai27@outlook.com>
1 parent 6cd18f2 commit 6537533

File tree

2 files changed

+26
-50
lines changed

2 files changed

+26
-50
lines changed

‎.github/workflows/pr-sglang.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
- "scripts/telemetry/**"
5454
test-change:
5555
- "test/sglang/**"
56-
- ".github/workflows/pr-sglang*"
5756
57+
# - ".github/workflows/pr-sglang*"
5858
# ======================================================
5959
# =============== SGLang SageMaker jobs ================
6060
# ======================================================
@@ -137,11 +137,8 @@ jobs:
137137
echo "IMAGE_URI=${IMAGE_URI}" >> ${GITHUB_OUTPUT}
138138
139139
sglang-frontend-test:
140-
needs: [set-test-environment, build-sglang-image]
140+
needs: [build-sglang-image, set-test-environment]
141141
if: success()
142-
# if: |
143-
# always() && !failure() && !cancelled() &&
144-
# (needs.set-test-environment.result == 'success' && needs.build-sglang-image.result == 'success')
145142
runs-on:
146143
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
147144
fleet:x86-g6exl-runner

‎.github/workflows/pr-vllm.yml‎

Lines changed: 24 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
pull_request:
55
branches:
66
- main
7-
# paths:
8-
# - "**vllm**"
7+
paths:
8+
- "**vllm**"
99

1010
permissions:
1111
contents: read
@@ -56,8 +56,8 @@ jobs:
5656
- "scripts/telemetry/**"
5757
test-change:
5858
- "test/vllm/**"
59-
# - ".github/workflows/pr-vllm*"
6059
60+
# - ".github/workflows/pr-vllm*"
6161
# ==============================================
6262
# =============== vLLM EC2 jobs ================
6363
# ==============================================
@@ -112,8 +112,7 @@ jobs:
112112
needs: [check-changes, build-vllm-ec2-image]
113113
if: |
114114
always() && !failure() && !cancelled() &&
115-
(needs.build-vllm-ec2-image.result == 'success' ||
116-
(needs.check-changes.outputs.build-change == 'false') && (needs.check-changes.outputs.test-change == 'true'))
115+
(needs.check-changes.outputs.build-change == 'true' || needs.check-changes.outputs.test-change == 'true')
117116
runs-on: ubuntu-latest
118117
concurrency:
119118
group: ${{ github.workflow }}-set-ec2-test-environment-${{ github.event.pull_request.number }}
@@ -141,10 +140,8 @@ jobs:
141140
echo "IMAGE_URI=${IMAGE_URI}" >> ${GITHUB_OUTPUT}
142141
143142
vllm-ec2-regression-test:
144-
needs: [set-ec2-test-environment]
145-
if: |
146-
always() && !failure() && !cancelled() &&
147-
needs.set-ec2-test-environment.result == 'success'
143+
needs: [build-vllm-ec2-image, set-ec2-test-environment]
144+
if: success()
148145
runs-on:
149146
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
150147
fleet:x86-g6xl-runner
@@ -210,10 +207,8 @@ jobs:
210207
container_id: ${CONTAINER_ID}
211208

212209
vllm-ec2-cuda-test:
213-
needs: [set-ec2-test-environment]
214-
if: |
215-
always() && !failure() && !cancelled() &&
216-
needs.set-ec2-test-environment.result == 'success'
210+
needs: [build-vllm-ec2-image, set-ec2-test-environment]
211+
if: success()
217212
runs-on:
218213
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
219214
fleet:x86-g6xl-runner
@@ -278,10 +273,8 @@ jobs:
278273
container_id: ${CONTAINER_ID}
279274

280275
vllm-ec2-example-test:
281-
needs: [set-ec2-test-environment]
282-
if: |
283-
always() && !failure() && !cancelled() &&
284-
needs.set-ec2-test-environment.result == 'success'
276+
needs: [build-vllm-ec2-image, set-ec2-test-environment]
277+
if: success()
285278
runs-on:
286279
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
287280
fleet:x86-g6xl-runner
@@ -414,8 +407,7 @@ jobs:
414407
needs: [check-changes, build-vllm-rayserve-image]
415408
if: |
416409
always() && !failure() && !cancelled() &&
417-
(needs.build-vllm-rayserve-image.result == 'success' ||
418-
(needs.check-changes.outputs.build-change == 'false') && (needs.check-changes.outputs.test-change == 'true'))
410+
(needs.check-changes.outputs.build-change == 'true' || needs.check-changes.outputs.test-change == 'true')
419411
runs-on: ubuntu-latest
420412
concurrency:
421413
group: ${{ github.workflow }}-set-rayserve-test-environment-${{ github.event.pull_request.number }}
@@ -443,10 +435,8 @@ jobs:
443435
echo "IMAGE_URI=${IMAGE_URI}" >> ${GITHUB_OUTPUT}
444436
445437
vllm-rayserve-regression-test:
446-
needs: [set-rayserve-test-environment]
447-
if: |
448-
always() && !failure() && !cancelled() &&
449-
needs.set-rayserve-test-environment.result == 'success'
438+
needs: [build-vllm-rayserve-image, set-rayserve-test-environment]
439+
if: success()
450440
runs-on:
451441
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
452442
fleet:x86-g6xl-runner
@@ -512,10 +502,8 @@ jobs:
512502
container_id: ${CONTAINER_ID}
513503

514504
vllm-rayserve-cuda-test:
515-
needs: [set-rayserve-test-environment]
516-
if: |
517-
always() && !failure() && !cancelled() &&
518-
needs.set-rayserve-test-environment.result == 'success'
505+
needs: [build-vllm-rayserve-image, set-rayserve-test-environment]
506+
if: success()
519507
runs-on:
520508
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
521509
fleet:x86-g6xl-runner
@@ -580,10 +568,8 @@ jobs:
580568
container_id: ${CONTAINER_ID}
581569

582570
vllm-rayserve-example-test:
583-
needs: [set-rayserve-test-environment]
584-
if: |
585-
always() && !failure() && !cancelled() &&
586-
needs.set-rayserve-test-environment.result == 'success'
571+
needs: [build-vllm-rayserve-image, set-rayserve-test-environment]
572+
if: success()
587573
runs-on:
588574
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
589575
fleet:x86-g6xl-runner
@@ -716,8 +702,7 @@ jobs:
716702
needs: [check-changes, build-vllm-sagemaker-image]
717703
if: |
718704
always() && !failure() && !cancelled() &&
719-
(needs.build-vllm-sagemaker-image.result == 'success' ||
720-
(needs.check-changes.outputs.build-change == 'false') && (needs.check-changes.outputs.test-change == 'true'))
705+
(needs.check-changes.outputs.build-change == 'true' || needs.check-changes.outputs.test-change == 'true')
721706
runs-on: ubuntu-latest
722707
concurrency:
723708
group: ${{ github.workflow }}-set-sagemaker-test-environment-${{ github.event.pull_request.number }}
@@ -745,10 +730,8 @@ jobs:
745730
echo "IMAGE_URI=${IMAGE_URI}" >> ${GITHUB_OUTPUT}
746731
747732
vllm-sagemaker-regression-test:
748-
needs: [set-sagemaker-test-environment]
749-
if: |
750-
always() && !failure() && !cancelled() &&
751-
needs.set-sagemaker-test-environment.result == 'success'
733+
needs: [build-vllm-sagemaker-image, set-sagemaker-test-environment]
734+
if: success()
752735
runs-on:
753736
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
754737
fleet:x86-g6xl-runner
@@ -814,10 +797,8 @@ jobs:
814797
container_id: ${CONTAINER_ID}
815798

816799
vllm-sagemaker-cuda-test:
817-
needs: [set-sagemaker-test-environment]
818-
if: |
819-
always() && !failure() && !cancelled() &&
820-
needs.set-sagemaker-test-environment.result == 'success'
800+
needs: [build-vllm-sagemaker-image, set-sagemaker-test-environment]
801+
if: success()
821802
runs-on:
822803
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
823804
fleet:x86-g6xl-runner
@@ -882,10 +863,8 @@ jobs:
882863
container_id: ${CONTAINER_ID}
883864

884865
vllm-sagemaker-example-test:
885-
needs: [set-sagemaker-test-environment]
886-
if: |
887-
always() && !failure() && !cancelled() &&
888-
needs.set-sagemaker-test-environment.result == 'success'
866+
needs: [build-vllm-sagemaker-image, set-sagemaker-test-environment]
867+
if: success()
889868
runs-on:
890869
- codebuild-runner-${{ github.run_id }}-${{ github.run_attempt }}
891870
fleet:x86-g6xl-runner

0 commit comments

Comments
 (0)