"lib/bindings/python/vscode:/vscode.git/clone" did not exist on "e22bb0376fec83e690c8715d2987378433ca2d5c"
Unverified Commit 82577b06 authored by Pavithra Vijayakrishnan's avatar Pavithra Vijayakrishnan Committed by GitHub
Browse files

ci: Update the pre_merge markers to exclude gpu_2 tests running (#4909)


Signed-off-by: default avatarpvijayakrish <pvijayakrish@nvidia.com>
parent d0e95c39
...@@ -192,7 +192,7 @@ jobs: ...@@ -192,7 +192,7 @@ jobs:
uses: ./.github/actions/pytest uses: ./.github/actions/pytest
with: with:
image_tag: ${{ steps.build-image.outputs.image_tag }} image_tag: ${{ steps.build-image.outputs.image_tag }}
pytest_marks: "pre_merge and vllm" pytest_marks: "pre_merge and vllm and (gpu_0 or gpu_1)"
framework: "vllm" framework: "vllm"
test_type: "pre_merge" test_type: "pre_merge"
platform_arch: ${{ matrix.platform.arch }} platform_arch: ${{ matrix.platform.arch }}
...@@ -253,7 +253,7 @@ jobs: ...@@ -253,7 +253,7 @@ jobs:
uses: ./.github/actions/pytest uses: ./.github/actions/pytest
with: with:
image_tag: ${{ steps.build-image.outputs.image_tag }} image_tag: ${{ steps.build-image.outputs.image_tag }}
pytest_marks: "pre_merge and sglang" pytest_marks: "pre_merge and sglang and (gpu_0 or gpu_1)"
framework: "sglang" framework: "sglang"
test_type: "pre_merge" test_type: "pre_merge"
platform_arch: ${{ matrix.platform.arch }} platform_arch: ${{ matrix.platform.arch }}
...@@ -314,7 +314,7 @@ jobs: ...@@ -314,7 +314,7 @@ jobs:
uses: ./.github/actions/pytest uses: ./.github/actions/pytest
with: with:
image_tag: ${{ steps.build-image.outputs.image_tag }} image_tag: ${{ steps.build-image.outputs.image_tag }}
pytest_marks: "pre_merge and trtllm" pytest_marks: "pre_merge and trtllm and (gpu_0 or gpu_1)"
framework: "trtllm" framework: "trtllm"
test_type: "pre_merge" test_type: "pre_merge"
platform_arch: ${{ matrix.platform.arch }} platform_arch: ${{ matrix.platform.arch }}
......
...@@ -66,7 +66,7 @@ jobs: ...@@ -66,7 +66,7 @@ jobs:
docker compose down docker compose down
- name: Run pytest (parallel tests with xdist) - name: Run pytest (parallel tests with xdist)
env: env:
PYTEST_MARKS: "pre_merge and parallel and not (vllm or sglang or trtllm)" PYTEST_MARKS: "pre_merge and parallel and not (vllm or sglang or trtllm) and (gpu_0 or gpu_1)"
run: | run: |
docker run -w /workspace \ docker run -w /workspace \
--name ${{ env.CONTAINER_ID }}_pytest_parallel \ --name ${{ env.CONTAINER_ID }}_pytest_parallel \
...@@ -78,7 +78,7 @@ jobs: ...@@ -78,7 +78,7 @@ jobs:
docker cp ${{ env.CONTAINER_ID }}_pytest_parallel:/workspace/${{ env.PYTEST_PARALLEL_XML_FILE }} . || echo "No parallel test report found" docker cp ${{ env.CONTAINER_ID }}_pytest_parallel:/workspace/${{ env.PYTEST_PARALLEL_XML_FILE }} . || echo "No parallel test report found"
- name: Run pytest (sequential tests) - name: Run pytest (sequential tests)
env: env:
PYTEST_MARKS: "((pre_merge and not parallel) or mypy) and not (vllm or sglang or trtllm)" PYTEST_MARKS: "((pre_merge and not parallel) or mypy) and not (vllm or sglang or trtllm) and (gpu_0 or gpu_1)"
run: | run: |
docker run -w /workspace \ docker run -w /workspace \
--name ${{ env.CONTAINER_ID }}_pytest \ --name ${{ env.CONTAINER_ID }}_pytest \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment