From e428b8239816a1352b55ed359e8ed1f63bf115b9 Mon Sep 17 00:00:00 2001
From: Connor Hack <connorhack@meta.com>
Date: Mon, 25 Nov 2024 06:44:55 -0800
Subject: [PATCH] Revert test formula

---
 .github/workflows/gha_workflow_llama_stack_tests.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gha_workflow_llama_stack_tests.yml b/.github/workflows/gha_workflow_llama_stack_tests.yml
index d68d6801d..6eb2700dc 100644
--- a/.github/workflows/gha_workflow_llama_stack_tests.yml
+++ b/.github/workflows/gha_workflow_llama_stack_tests.yml
@@ -229,7 +229,6 @@ jobs:
       - name: "Run Tests: Loop"
         id: run_tests_loop
         working-directory: "${{ github.workspace }}"
-        if: github.event_name == 'pull_request_target'
         run: |
           pattern=""
           for dir in llama_stack/providers/tests/*; do
@@ -255,7 +254,6 @@ jobs:
       - name: "Test Summary: Merge"
         id: test_summary_merge
         working-directory: "${{ github.workspace }}"
-        if: github.event_name == 'pull_request_target'
         run: |
           echo "Merging the following test result files: ${REPORTS_GEN}"
           # Defaults to merging them into 'merged-test-results.xml'
@@ -317,8 +315,12 @@ jobs:
         if: github.event_name == 'workflow_dispatch'
         run: |
           echo "[STEP] Running PyTest tests at 'GITHUB_WORKSPACE' path: ${{ github.workspace }}"
+
+          #TODO Use this when collection errors are resolved
+          # pytest -s -v -m "${PROVIDER_ID} and ${MODEL_ID}" --junitxml="${{ github.workspace }}/merged-test-results.xml"
+
           # (Optional) Add more tests here.
-          pytest -s -v -m "${PROVIDER_ID} and ${MODEL_ID}" --junitxml="${{ github.workspace }}/merged-test-results.xml"
+
           # Merge test results with 'merged-test-results.xml' from above.
           # junit-merge <new-test-results> merged-test-results.xml