update

.github/workflows/ci-test.yml

@@ -48,9 +48,20 @@ jobs:
             fairscale lm-format-enforcer \
             zmq chardet pypdf \
             pandas sentence_transformers together \
-            aiosqlite groq ollama fireworks \
+            aiosqlite groq ollama fireworks-ai \
             pytest-html pytest-asyncio
 
+      - name: Install Ollama
+        run: |
+          curl -fsSL https://ollama.com/install.sh | sh
+
+      - name: spin up ollama server
+        run: |
+          which -a ollama
+          ollama run llama3.2-vision:11b-instruct-fp16
+          ollama run llama3.1:8b-instruct-fp16
+          sleep 10
+
       - name: Run integration test
         working-directory: "${{ github.workspace }}"
         run: |
@@ -60,12 +71,12 @@ jobs:
           echo "Repository root: ${{ github.workspace }}"
           echo "Branch: ${{ github.ref }}"
           echo "List of tests"
-          pytest ${{ github.workspace }}/llama_stack/providers/tests/ --html=report.html --config=ci_test_config.yaml
+          pytest ${{ github.workspace }}/llama_stack/providers/tests/ --config=ci_test_config.yaml
 
       - name: Upload pytest test results
         uses: actions/upload-artifact@v4
         with:
-          name: report.html
-          path: report.html
+          name: pytest_report.md
+          path: pytest_report.md
         # Use always() to always run this step to publish test results when there are test failures
         if: ${{ always() }}

llama_stack/providers/tests/ci_test_config.yaml

@@ -16,8 +16,8 @@ inference_fixtures:
   - ollama
   - fireworks
   - together
-  - tgi
-  - vllm_remote
+  # - tgi
+  # - vllm_remote
 
 test_models:
   text: meta-llama/Llama-3.1-8B-Instruct

llama_stack/providers/tests/report.py

@@ -6,10 +6,7 @@
 
 
 from collections import defaultdict
-<<<<<<< HEAD
 from pathlib import Path
-=======
->>>>>>> 991f0e0 (ci test report)
 
 import pytest
 from llama_models.datatypes import CoreModelId