Skip to content

Commit c3e5ea2

Browse files
chtruong814chtruong814
committed
Removing deprecated nemo test
Signed-off-by: Charlie Truong <chtruong@nvidia.com>
1 parent 7f6a1f5 commit c3e5ea2

2 files changed

Lines changed: 159 additions & 266 deletions

File tree

‎.github/workflows/cicd-main.yml‎

Lines changed: 159 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -68,109 +68,109 @@ jobs:
6868
ruff check .
6969
ruff format --check .
7070
71-
# cicd-wait-in-queue:
72-
# needs: [pre-flight, linting]
73-
# runs-on: ubuntu-latest
74-
# environment: test
75-
# if: |
76-
# !(needs.pre-flight.outputs.is_ci_workload == 'true'
77-
# || needs.pre-flight.outputs.is_deployment_workflow == 'true'
78-
# || needs.pre-flight.outputs.docs_only == 'true')
79-
# steps:
80-
# - name: Running CI tests
81-
# run: |
82-
# echo "Running CI tests"
71+
cicd-wait-in-queue:
72+
needs: [pre-flight, linting]
73+
runs-on: ubuntu-latest
74+
environment: test
75+
if: |
76+
!(needs.pre-flight.outputs.is_ci_workload == 'true'
77+
|| needs.pre-flight.outputs.is_deployment_workflow == 'true'
78+
|| needs.pre-flight.outputs.docs_only == 'true')
79+
steps:
80+
- name: Running CI tests
81+
run: |
82+
echo "Running CI tests"
8383
84-
# cicd-unit-tests-trtllm:
85-
# strategy:
86-
# fail-fast: false
87-
# matrix:
88-
# include:
89-
# - script: L0_Unit_Tests_GPU
90-
# runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
91-
# - script: L0_Unit_Tests_CPU
92-
# runner: linux-amd64-cpu16
93-
# cpu-only: true
94-
# needs: [pre-flight, cicd-wait-in-queue]
95-
# if: |
96-
# (
97-
# success()
98-
# || needs.pre-flight.outputs.is_ci_workload == 'true'
99-
# || needs.pre-flight.outputs.force_run_all == 'true'
100-
# )
101-
# && !cancelled()
102-
# runs-on: ${{ matrix.runner }}
103-
# name: ${{ matrix.script }}
104-
# environment: nemo-ci
105-
# steps:
106-
# - name: Checkout
107-
# uses: actions/checkout@v4
108-
# - name: main
109-
# uses: ./.github/actions/test-template
110-
# with:
111-
# script: ${{ matrix.script }}
112-
# timeout: 60
113-
# is_unit_test: "true"
114-
# cpu-only: ${{ matrix.cpu-only || false }}
115-
# has-azure-credentials: "true"
116-
# azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
117-
# azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
118-
# azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
119-
# PAT: ${{ secrets.PAT }}
120-
# inference-framework: trtllm
121-
# test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
122-
# runner: ${{ matrix.runner }}
84+
cicd-unit-tests-trtllm:
85+
strategy:
86+
fail-fast: false
87+
matrix:
88+
include:
89+
- script: L0_Unit_Tests_GPU
90+
runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
91+
- script: L0_Unit_Tests_CPU
92+
runner: linux-amd64-cpu16
93+
cpu-only: true
94+
needs: [pre-flight, cicd-wait-in-queue]
95+
if: |
96+
(
97+
success()
98+
|| needs.pre-flight.outputs.is_ci_workload == 'true'
99+
|| needs.pre-flight.outputs.force_run_all == 'true'
100+
)
101+
&& !cancelled()
102+
runs-on: ${{ matrix.runner }}
103+
name: ${{ matrix.script }}
104+
environment: nemo-ci
105+
steps:
106+
- name: Checkout
107+
uses: actions/checkout@v4
108+
- name: main
109+
uses: ./.github/actions/test-template
110+
with:
111+
script: ${{ matrix.script }}
112+
timeout: 60
113+
is_unit_test: "true"
114+
cpu-only: ${{ matrix.cpu-only || false }}
115+
has-azure-credentials: "true"
116+
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
117+
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
118+
azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
119+
PAT: ${{ secrets.PAT }}
120+
inference-framework: trtllm
121+
test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
122+
runner: ${{ matrix.runner }}
123123

124-
# cicd-unit-tests-vllm:
125-
# strategy:
126-
# fail-fast: false
127-
# matrix:
128-
# include:
129-
# - script: L0_Unit_Tests_GPU
130-
# runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
131-
# - script: L0_Unit_Tests_CPU
132-
# runner: linux-amd64-cpu16
133-
# cpu-only: true
134-
# needs: [pre-flight, cicd-wait-in-queue]
135-
# if: |
136-
# (
137-
# success()
138-
# || needs.pre-flight.outputs.is_ci_workload == 'true'
139-
# || needs.pre-flight.outputs.force_run_all == 'true'
140-
# )
141-
# && !cancelled()
142-
# runs-on: ${{ matrix.runner }}
143-
# name: ${{ matrix.script }}
144-
# environment: nemo-ci
145-
# steps:
146-
# - name: Checkout
147-
# uses: actions/checkout@v4
148-
# - name: main
149-
# uses: ./.github/actions/test-template
150-
# with:
151-
# script: ${{ matrix.script }}
152-
# timeout: 60
153-
# is_unit_test: "true"
154-
# cpu-only: ${{ matrix.cpu-only || false }}
155-
# has-azure-credentials: "true"
156-
# azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
157-
# azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
158-
# azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
159-
# PAT: ${{ secrets.PAT }}
160-
# inference-framework: vllm
161-
# test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
162-
# runner: ${{ matrix.runner }}
124+
cicd-unit-tests-vllm:
125+
strategy:
126+
fail-fast: false
127+
matrix:
128+
include:
129+
- script: L0_Unit_Tests_GPU
130+
runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
131+
- script: L0_Unit_Tests_CPU
132+
runner: linux-amd64-cpu16
133+
cpu-only: true
134+
needs: [pre-flight, cicd-wait-in-queue]
135+
if: |
136+
(
137+
success()
138+
|| needs.pre-flight.outputs.is_ci_workload == 'true'
139+
|| needs.pre-flight.outputs.force_run_all == 'true'
140+
)
141+
&& !cancelled()
142+
runs-on: ${{ matrix.runner }}
143+
name: ${{ matrix.script }}
144+
environment: nemo-ci
145+
steps:
146+
- name: Checkout
147+
uses: actions/checkout@v4
148+
- name: main
149+
uses: ./.github/actions/test-template
150+
with:
151+
script: ${{ matrix.script }}
152+
timeout: 60
153+
is_unit_test: "true"
154+
cpu-only: ${{ matrix.cpu-only || false }}
155+
has-azure-credentials: "true"
156+
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
157+
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
158+
azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
159+
PAT: ${{ secrets.PAT }}
160+
inference-framework: vllm
161+
test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
162+
runner: ${{ matrix.runner }}
163163

164164
cicd-e2e-tests-trtllm:
165165
strategy:
166166
fail-fast: false
167167
matrix:
168168
include:
169-
# - script: L2_Launch_TRTLLM
170-
# runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
169+
- script: L2_Launch_TRTLLM
170+
runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
171171
- script: L2_TRTLLM_API_Deploy_Query
172172
runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
173-
needs: [pre-flight]
173+
needs: [pre-flight, cicd-unit-tests-trtllm]
174174
runs-on: ${{ matrix.runner }}
175175
name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
176176
if: |
@@ -200,72 +200,72 @@ jobs:
200200
test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
201201
runner: ${{ matrix.runner }}
202202

203-
# cicd-e2e-tests-trt-onnx:
204-
# needs: [cicd-unit-tests-trtllm, pre-flight]
205-
# runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
206-
# name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
207-
# environment: nemo-ci
208-
# if: |
209-
# (
210-
# success()
211-
# || (
212-
# needs.cicd-wait-in-queue.result == 'skipped'
213-
# && needs.pre-flight.outputs.is_ci_workload == 'true'
214-
# )
215-
# )
216-
# && !cancelled()
217-
# steps:
218-
# - name: Checkout
219-
# uses: actions/checkout@v4
220-
# - name: main
221-
# uses: ./.github/actions/test-template
222-
# with:
223-
# script: L2_ONNX_TRT
224-
# is_optional: ${{ matrix.is_optional || false }}
225-
# azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
226-
# azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
227-
# azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
228-
# has-azure-credentials: true
229-
# is_unit_test: "false"
230-
# timeout: 60
231-
# PAT: ${{ secrets.PAT }}
232-
# inference-framework: trt-onnx
233-
# test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
234-
# runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
203+
cicd-e2e-tests-trt-onnx:
204+
needs: [cicd-unit-tests-trtllm, pre-flight]
205+
runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
206+
name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
207+
environment: nemo-ci
208+
if: |
209+
(
210+
success()
211+
|| (
212+
needs.cicd-wait-in-queue.result == 'skipped'
213+
&& needs.pre-flight.outputs.is_ci_workload == 'true'
214+
)
215+
)
216+
&& !cancelled()
217+
steps:
218+
- name: Checkout
219+
uses: actions/checkout@v4
220+
- name: main
221+
uses: ./.github/actions/test-template
222+
with:
223+
script: L2_ONNX_TRT
224+
is_optional: ${{ matrix.is_optional || false }}
225+
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
226+
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
227+
azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
228+
has-azure-credentials: true
229+
is_unit_test: "false"
230+
timeout: 60
231+
PAT: ${{ secrets.PAT }}
232+
inference-framework: trt-onnx
233+
test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
234+
runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
235235

236-
# cicd-e2e-tests-vllm:
237-
# needs: [cicd-unit-tests-vllm, pre-flight]
238-
# runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
239-
# name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
240-
# environment: nemo-ci
241-
# if: |
242-
# (
243-
# success()
244-
# || needs.pre-flight.outputs.is_ci_workload == 'true'
245-
# || needs.pre-flight.outputs.force_run_all == 'true'
246-
# )
247-
# && !cancelled()
248-
# steps:
249-
# - name: Checkout
250-
# uses: actions/checkout@v4
251-
# - name: main
252-
# uses: ./.github/actions/test-template
253-
# with:
254-
# script: L2_Launch_vLLM
255-
# is_optional: ${{ matrix.is_optional || false }}
256-
# azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
257-
# azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
258-
# azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
259-
# has-azure-credentials: true
260-
# is_unit_test: "false"
261-
# timeout: 60
262-
# PAT: ${{ secrets.PAT }}
263-
# inference-framework: vllm
264-
# test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
265-
# runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
236+
cicd-e2e-tests-vllm:
237+
needs: [cicd-unit-tests-vllm, pre-flight]
238+
runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
239+
name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
240+
environment: nemo-ci
241+
if: |
242+
(
243+
success()
244+
|| needs.pre-flight.outputs.is_ci_workload == 'true'
245+
|| needs.pre-flight.outputs.force_run_all == 'true'
246+
)
247+
&& !cancelled()
248+
steps:
249+
- name: Checkout
250+
uses: actions/checkout@v4
251+
- name: main
252+
uses: ./.github/actions/test-template
253+
with:
254+
script: L2_Launch_vLLM
255+
is_optional: ${{ matrix.is_optional || false }}
256+
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
257+
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
258+
azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
259+
has-azure-credentials: true
260+
is_unit_test: "false"
261+
timeout: 60
262+
PAT: ${{ secrets.PAT }}
263+
inference-framework: vllm
264+
test-data-path: ${{ needs.pre-flight.outputs.test_data_path }}
265+
runner: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
266266

267267
cicd-e2e-tests-inframework:
268-
needs: [pre-flight]
268+
needs: [pre-flight, cicd-unit-tests-trtllm, cicd-unit-tests-vllm]]
269269
runs-on: ${{ needs.pre-flight.outputs.runner_prefix }}-gpu-x2
270270
name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
271271
environment: nemo-ci
@@ -298,10 +298,10 @@ jobs:
298298
Nemo_CICD_Test:
299299
needs:
300300
- pre-flight
301-
# - cicd-unit-tests-trtllm
302-
# - cicd-unit-tests-vllm
301+
- cicd-unit-tests-trtllm
302+
- cicd-unit-tests-vllm
303303
- cicd-e2e-tests-trtllm
304-
# - cicd-e2e-tests-vllm
304+
- cicd-e2e-tests-vllm
305305
- cicd-e2e-tests-inframework
306306
if: |
307307
(

0 commit comments

Comments
 (0)