From 40cc4834d80d9fbfbbb221df14b88b866ab45e70 Mon Sep 17 00:00:00 2001
From: Sixian Yi <sxyi@meta.com>
Date: Fri, 10 Jan 2025 01:37:03 -0800
Subject: [PATCH] update

---
 .github/workflows/ci-test.yml                   | 13 +++++++++----
 llama_stack/providers/tests/ci_test_config.yaml |  4 ++--
 llama_stack/providers/tests/report.py           |  3 ---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 5285682b26..da69bdb217 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -48,9 +48,14 @@ 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: spin up ollama server
+        run: |
+          ollama run llama3.2-vision:11b-instruct-fp16
+          ollama run llama3.1:8b-instruct-fp16
+
       - name: Run integration test
         working-directory: "${{ github.workspace }}"
         run: |
@@ -60,12 +65,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() }}
diff --git a/llama_stack/providers/tests/ci_test_config.yaml b/llama_stack/providers/tests/ci_test_config.yaml
index c4c6b23199..c08f7607fa 100644
--- a/llama_stack/providers/tests/ci_test_config.yaml
+++ b/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
diff --git a/llama_stack/providers/tests/report.py b/llama_stack/providers/tests/report.py
index 86bcce90b5..bc1c132633 100644
--- a/llama_stack/providers/tests/report.py
+++ b/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