Skip to content

Commit 7a529d8

Browse files
sirutBuasaisirutBuasai
committed
chore: add cleanup
Signed-off-by: sirutBuasai <sirutbuasai27@outlook.com>
1 parent ca1e03d commit 7a529d8

File tree

3 files changed

+46
-51
lines changed

3 files changed

+46
-51
lines changed

‎.github/actions/container-cleanup/action.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Container Cleanup
2+
description: Remove container and clean up image caches.
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: Cleanup container and images
8+
shell: bash
9+
run: |
10+
run: |
11+
docker rm -f ${CONTAINER_ID} || true
12+
docker image prune -a --force --filter "until=24h"
13+
docker system df

‎.github/actions/pr-permission-gate/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: PR Permission Gate
2-
description: Fails the workflow if the PR sender lacks the required repository permission
2+
description: Fails the workflow if the PR sender lacks the required repository permission.
33
inputs:
44
required-level:
55
description: Minimum permission level required (read|triage|write|maintain|admin)

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

Lines changed: 32 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
--target vllm-ec2 \
7070
-f docker/vllm/Dockerfile .
7171
72-
- name: Docker Push and save image URI artifact
72+
- name: Docker push and save image URI artifact
7373
run: |
7474
docker push $IMAGE_URI
7575
docker rmi $IMAGE_URI
@@ -91,14 +91,14 @@ jobs:
9191
- name: Checkout DLC source
9292
uses: actions/checkout@v5
9393

94-
- name: Container Pull
94+
- name: Container pull
9595
uses: ./.github/actions/container-pull
9696
with:
9797
aws_region: ${{ secrets.AWS_REGION }}
9898
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
9999
artifact_name: vllm-ec2-image-uri
100100

101-
- name: Checkout vLLM Tests
101+
- name: Checkout vLLM tests
102102
uses: actions/checkout@v5
103103
with:
104104
repository: vllm-project/vllm
@@ -115,7 +115,7 @@ jobs:
115115
${IMAGE_URI})
116116
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
117117
118-
- name: Setup for vLLM Test
118+
- name: Setup for vLLM tests
119119
run: |
120120
docker exec ${CONTAINER_ID} sh -c '
121121
set -eux
@@ -127,7 +127,7 @@ jobs:
127127
mv vllm src/vllm
128128
'
129129
130-
- name: Run vLLM Tests
130+
- name: Run vLLM tests
131131
run: |
132132
docker exec ${CONTAINER_ID} sh -c '
133133
set -eux
@@ -141,10 +141,7 @@ jobs:
141141
142142
- name: Cleanup container and images
143143
if: always()
144-
run: |
145-
docker rm -f ${CONTAINER_ID} || true
146-
docker image prune -a --force --filter "until=24h"
147-
docker system df
144+
uses: ./.github/actions/container-cleanup
148145

149146
vllm-cuda-test:
150147
needs: [build-vllm-image]
@@ -156,14 +153,14 @@ jobs:
156153
- name: Checkout DLC source
157154
uses: actions/checkout@v5
158155

159-
- name: Container Pull
156+
- name: Container pull
160157
uses: ./.github/actions/container-pull
161158
with:
162159
aws_region: ${{ secrets.AWS_REGION }}
163160
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
164161
artifact_name: vllm-ec2-image-uri
165162

166-
- name: Checkout vLLM Tests
163+
- name: Checkout vLLM tests
167164
uses: actions/checkout@v5
168165
with:
169166
repository: vllm-project/vllm
@@ -180,7 +177,7 @@ jobs:
180177
${IMAGE_URI})
181178
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
182179
183-
- name: Setup for vLLM Test
180+
- name: Setup for vLLM tests
184181
run: |
185182
docker exec ${CONTAINER_ID} sh -c '
186183
set -eux
@@ -192,7 +189,7 @@ jobs:
192189
mv vllm src/vllm
193190
'
194191
195-
- name: Run vLLM Tests
192+
- name: Run vLLM tests
196193
run: |
197194
docker exec ${CONTAINER_ID} sh -c '
198195
set -eux
@@ -205,10 +202,7 @@ jobs:
205202
206203
- name: Cleanup container and images
207204
if: always()
208-
run: |
209-
docker rm -f ${CONTAINER_ID} || true
210-
docker image prune -a --force --filter "until=24h"
211-
docker system df
205+
uses: ./.github/actions/container-cleanup
212206

213207
vllm-example-test:
214208
needs: [build-vllm-image]
@@ -220,14 +214,14 @@ jobs:
220214
- name: Checkout DLC source
221215
uses: actions/checkout@v5
222216

223-
- name: Container Pull
217+
- name: Container pull
224218
uses: ./.github/actions/container-pull
225219
with:
226220
aws_region: ${{ secrets.AWS_REGION }}
227221
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
228222
artifact_name: vllm-ec2-image-uri
229223

230-
- name: Checkout vLLM Tests
224+
- name: Checkout vLLM tests
231225
uses: actions/checkout@v5
232226
with:
233227
repository: vllm-project/vllm
@@ -244,7 +238,7 @@ jobs:
244238
${IMAGE_URI})
245239
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
246240
247-
- name: Setup for vLLM Test
241+
- name: Setup for vLLM tests
248242
run: |
249243
docker exec ${CONTAINER_ID} sh -c '
250244
set -eux
@@ -256,7 +250,7 @@ jobs:
256250
mv vllm src/vllm
257251
'
258252
259-
- name: Run vLLM Tests
253+
- name: Run vLLM tests
260254
run: |
261255
docker exec ${CONTAINER_ID} sh -c '
262256
set -eux
@@ -284,10 +278,7 @@ jobs:
284278
285279
- name: Cleanup container and images
286280
if: always()
287-
run: |
288-
docker rm -f ${CONTAINER_ID} || true
289-
docker image prune -a --force --filter "until=24h"
290-
docker system df
281+
uses: ./.github/actions/container-cleanup
291282

292283
# vLLM RayServe jobs
293284
build-rayserve-image:
@@ -320,7 +311,7 @@ jobs:
320311
--target vllm-rayserve-ec2 \
321312
-f docker/vllm/Dockerfile.rayserve .
322313
323-
- name: Docker Push and save image URI artifact
314+
- name: Docker push and save image URI artifact
324315
run: |
325316
docker push $IMAGE_URI
326317
docker rmi $IMAGE_URI
@@ -342,14 +333,14 @@ jobs:
342333
- name: Checkout DLC source
343334
uses: actions/checkout@v5
344335

345-
- name: Container Pull
336+
- name: Container pull
346337
uses: ./.github/actions/container-pull
347338
with:
348339
aws_region: ${{ secrets.AWS_REGION }}
349340
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
350341
artifact_name: vllm-rayserve-ec2-image-uri
351342

352-
- name: Checkout vLLM Tests
343+
- name: Checkout vLLM tests
353344
uses: actions/checkout@v5
354345
with:
355346
repository: vllm-project/vllm
@@ -366,7 +357,7 @@ jobs:
366357
${IMAGE_URI})
367358
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
368359
369-
- name: Setup for vLLM Test
360+
- name: Setup for vLLM tests
370361
run: |
371362
docker exec ${CONTAINER_ID} sh -c '
372363
set -eux
@@ -378,7 +369,7 @@ jobs:
378369
mv vllm src/vllm
379370
'
380371
381-
- name: Run vLLM Tests
372+
- name: Run vLLM tests
382373
run: |
383374
docker exec ${CONTAINER_ID} sh -c '
384375
set -eux
@@ -392,10 +383,7 @@ jobs:
392383
393384
- name: Cleanup container and images
394385
if: always()
395-
run: |
396-
docker rm -f ${CONTAINER_ID} || true
397-
docker image prune -a --force --filter "until=24h"
398-
docker system df
386+
uses: ./.github/actions/container-cleanup
399387

400388
rayserve-cuda-test:
401389
needs: [build-rayserve-image]
@@ -407,14 +395,14 @@ jobs:
407395
- name: Checkout DLC source
408396
uses: actions/checkout@v5
409397

410-
- name: Container Pull
398+
- name: Container pull
411399
uses: ./.github/actions/container-pull
412400
with:
413401
aws_region: ${{ secrets.AWS_REGION }}
414402
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
415403
artifact_name: vllm-rayserve-ec2-image-uri
416404

417-
- name: Checkout vLLM Tests
405+
- name: Checkout vLLM tests
418406
uses: actions/checkout@v5
419407
with:
420408
repository: vllm-project/vllm
@@ -431,7 +419,7 @@ jobs:
431419
${IMAGE_URI})
432420
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
433421
434-
- name: Setup for vLLM Test
422+
- name: Setup for vLLM tests
435423
run: |
436424
docker exec ${CONTAINER_ID} sh -c '
437425
set -eux
@@ -443,7 +431,7 @@ jobs:
443431
mv vllm src/vllm
444432
'
445433
446-
- name: Run vLLM Tests
434+
- name: Run vLLM tests
447435
run: |
448436
docker exec ${CONTAINER_ID} sh -c '
449437
set -eux
@@ -456,10 +444,7 @@ jobs:
456444
457445
- name: Cleanup container and images
458446
if: always()
459-
run: |
460-
docker rm -f ${CONTAINER_ID} || true
461-
docker image prune -a --force --filter "until=24h"
462-
docker system df
447+
uses: ./.github/actions/container-cleanup
463448

464449
rayserve-example-test:
465450
needs: [build-rayserve-image]
@@ -471,14 +456,14 @@ jobs:
471456
- name: Checkout DLC source
472457
uses: actions/checkout@v5
473458

474-
- name: Container Pull
459+
- name: Container pull
475460
uses: ./.github/actions/container-pull
476461
with:
477462
aws_region: ${{ secrets.AWS_REGION }}
478463
aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
479464
artifact_name: vllm-rayserve-ec2-image-uri
480465

481-
- name: Checkout vLLM Tests
466+
- name: Checkout vLLM tests
482467
uses: actions/checkout@v5
483468
with:
484469
repository: vllm-project/vllm
@@ -495,7 +480,7 @@ jobs:
495480
${IMAGE_URI})
496481
echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
497482
498-
- name: Setup for vLLM Test
483+
- name: Setup for vLLM tests
499484
run: |
500485
docker exec ${CONTAINER_ID} sh -c '
501486
set -eux
@@ -507,7 +492,7 @@ jobs:
507492
mv vllm src/vllm
508493
'
509494
510-
- name: Run vLLM Tests
495+
- name: Run vLLM tests
511496
run: |
512497
docker exec ${CONTAINER_ID} sh -c '
513498
set -eux
@@ -535,7 +520,4 @@ jobs:
535520
536521
- name: Cleanup container and images
537522
if: always()
538-
run: |
539-
docker rm -f ${CONTAINER_ID} || true
540-
docker image prune -a --force --filter "until=24h"
541-
docker system df
523+
uses: ./.github/actions/container-cleanup

0 commit comments

Comments
 (0)