Fix perf.json file location to make it easier to retrieve from test h…

…osts
stackrox · Oct 10, 2023 · 7d1f1a8 · 7d1f1a8
1 parent 129fc70
commit 7d1f1a8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Calculate Baseline
         run: |
-          jq -s 'flatten' perf.json > integration-tests/perf-all.json
+          jq -s 'flatten' container-logs/**/perf.json > integration-tests/perf-all.json
 
           ./integration-tests/scripts/baseline/main.py --test integration-tests/perf-all.json \
             | sort \

diff --git a/.github/workflows/integration-tests-vm-type.yml b/.github/workflows/integration-tests-vm-type.yml
@@ -188,5 +188,4 @@ jobs:
           name: ${{ inputs.vm_type }}-logs
           path: |
             ${{ github.workspace }}/integration-tests/container-logs/**/*
-            ${{ github.workspace }}/integration-tests/perf.json
             ${{ github.workspace }}/integration-tests/performance-logs/**/*
diff --git a/ansible/roles/run-test-target/tasks/test-collection-method.yml b/ansible/roles/run-test-target/tasks/test-collection-method.yml
@@ -119,13 +119,6 @@
       loop_control:
         loop_var: remote_log_path
 
-    - name: Download perf JSON
-      fetch:
-        src: "{{ remote_log_mount }}/perf.json"
-        dest: "{{ integration_tests_root }}/"
-        flat: true
-        fail_on_missing: false
-
     - name: Write integration test log
       copy:
         content: "{{ test_result.stdout }}"

diff --git a/integration-tests/suites/base.go b/integration-tests/suites/base.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
@@ -192,7 +193,7 @@ func (s *IntegrationTestSuiteBase) WritePerfResults() {
 	}
 
 	perfJson, _ := json.Marshal(perf)
-	perfFilename := "perf.json"
+	perfFilename := filepath.Join(config.LogPath(), "perf.json")
 
 	fmt.Printf("Writing %s\n", perfFilename)
 	f, err := os.OpenFile(perfFilename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)