update tests slightly, other fixes

.github/actions/run-integration-tests/action.yml

@@ -30,7 +30,6 @@ runs:
     - name: Run Integration Tests
       env:
         LLAMA_STACK_CLIENT_TIMEOUT: "300"
-        LLAMA_STACK_TEST_RECORDING_DIR: "tests/integration/recordings"
         LLAMA_STACK_TEST_INFERENCE_MODE: ${{ inputs.inference-mode }}
       shell: bash
       run: |
@@ -51,6 +50,7 @@ runs:
         fi
 
         if [ "${{ inputs.run-vision-tests }}" == "true" ]; then
+          export LLAMA_STACK_TEST_RECORDING_DIR="tests/integration/recordings/vision"
           if uv run pytest -s -v tests/integration/inference/test_vision_inference.py --stack-config=${stack_config} \
             -k "not( ${EXCLUDE_TESTS} )" \
             --vision-model=ollama/llama3.2-vision:11b \
@@ -66,6 +66,8 @@ runs:
           exit 0
         fi
 
+        # Run non-vision tests
+        export LLAMA_STACK_TEST_RECORDING_DIR="tests/integration/recordings"
         TEST_TYPES='${{ inputs.test-types }}'
         echo "Test types to run: $TEST_TYPES"
 

.github/workflows/integration-tests.yml

@@ -128,11 +128,10 @@ jobs:
 
       - name: Commit and push recordings
         run: |
-          if ! git diff --quiet tests/integration/recordings/; then
-            echo "Committing recordings"
+          if ! git status --porcelain tests/integration/recordings/ | grep -q .; then
+            echo "New recordings detected, committing and pushing"
             git add tests/integration/recordings/
             git commit -m "Update recordings"
-            echo "Pushing all recording commits to PR"
             git push origin HEAD:${{ github.head_ref }}
           else
             echo "No recording changes"

.github/workflows/integration-vision-tests.yml

@@ -25,7 +25,14 @@ on:
         default: false
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ contains(github.event.pull_request.labels.*.name, 're-record-tests') && 'rerecord' || 'replay' }}
+  group: >-
+    ${{ github.workflow }}-${{ github.ref }}-${{
+    (github.event.action == 'opened' ||
+     github.event.action == 'synchronize' ||
+     (github.event.action == 'labeled' && contains(github.event.pull_request.labels.*.name, 're-record-tests'))) &&
+    (contains(github.event.pull_request.labels.*.name, 're-record-tests') && 'rerecord' || 'replay') ||
+    'no-run'
+    }}
   cancel-in-progress: true
 
 jobs:
@@ -100,11 +107,10 @@ jobs:
 
       - name: Commit and push recordings
         run: |
-          if ! git diff --quiet tests/integration/recordings/; then
-            echo "Committing recordings"
+          if ! git status --porcelain tests/integration/recordings/ | grep -q .; then
+            echo "New recordings detected, committing and pushing"
             git add tests/integration/recordings/
             git commit -m "Update recordings"
-            echo "Pushing all recording commits to PR"
             git push origin HEAD:${{ github.head_ref }}
           else
             echo "No recording changes"