diff --git a/.github/workflows/pre-merge-python.yml b/.github/workflows/pre-merge-python.yml index ba542dba50..0d110c1bd3 100644 --- a/.github/workflows/pre-merge-python.yml +++ b/.github/workflows/pre-merge-python.yml @@ -17,45 +17,29 @@ name: NVIDIA Test Github Validation on: push: - branches: - - main pull_request: jobs: build-test: - runs-on: - group: Fastchecker + runs-on: ubuntu-latest strategy: matrix: framework: - vllm + name: Build and Test - ${{ matrix.framework }} env: CONTAINER_ID: test_${{ github.run_id }}_${{ github.run_attempt }}_${{ github.job }}_${{ matrix.framework }} - PYTEST_XML_FILE: pytest_test_report.xml + PYTEST_MD_FILE: ${{ matrix.framework }}-report.md + PYTEST_XML_FILE: ${{ matrix.framework }}-report.xml steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Define Image Tag - id: define_image_tag - run: | - echo "image_tag=dynamo:latest-${{ matrix.framework }}" >> $GITHUB_OUTPUT - - name: Build image - env: - GITHUB_TOKEN: ${{ secrets.CI_TOKEN }} - run: | - ./container/build.sh --tag ${{ steps.define_image_tag.outputs.image_tag }} --target ci_minimum --framework ${{ matrix.framework }} - - name: Run pytest - env: - PYTEST_MARKS: "pre_merge or mypy" - run: | - docker run -w /workspace --name ${{ env.CONTAINER_ID }} ${{ steps.define_image_tag.outputs.image_tag }} pytest --basetemp=/tmp --junitxml=${{ env.PYTEST_XML_FILE }} -m "${{ env.PYTEST_MARKS }}" - - name: Copy test report from test Container + - run: | + pip install -r container/deps/requirements.test.txt + pytest -v --md-report --md-report-flavor gfm --md-report-exclude-outcomes passed skipped xpassed --md-report-output ${{ env.PYTEST_MD_FILE }} --junitxml=${{ env.PYTEST_XML_FILE }} success_test.py + - run: ls -al if: always() - run: | - docker cp ${{ env.CONTAINER_ID }}:/workspace/${{ env.PYTEST_XML_FILE }} . - name: Archive test report uses: actions/upload-artifact@v4 if: always() @@ -64,14 +48,15 @@ jobs: if-no-files-found: error path: | ${{ env.PYTEST_XML_FILE }} + ${{ env.PYTEST_MD_FILE }} - event_file: - name: "Event File" - runs-on: ubuntu-latest - if: ${{ github.event_name == 'pull_request' }} - steps: - - name: Upload - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 - with: - name: Event File - path: ${{ github.event_path }} +# event_file: +# name: "Event File" +# runs-on: ubuntu-latest +# if: ${{ github.event_name == 'pull_request' }} +# steps: +# - name: Upload +# uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 +# with: +# name: Event File +# path: ${{ github.event_path }} diff --git a/container/Dockerfile.vllm b/container/Dockerfile.vllm index fe6e0c729f..c9b1d12e47 100644 --- a/container/Dockerfile.vllm +++ b/container/Dockerfile.vllm @@ -3,7 +3,7 @@ ARG BASE_IMAGE="nvcr.io/nvidia/cuda-dl-base" ARG BASE_IMAGE_TAG="25.01-cuda12.8-devel-ubuntu24.04" - +#REMOVE THIS LINE ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE_TAG="12.8.1-runtime-ubuntu24.04" diff --git a/success_test.py b/success_test.py new file mode 100644 index 0000000000..1e755439c3 --- /dev/null +++ b/success_test.py @@ -0,0 +1,10 @@ +import pytest + +def test_passin1(): + assert True + +def test_passin2(): + assert True + +def test_passin3(): + assert True