Reorganize output json

Author: edeandrea

benchmarks/README.md

@@ -127,7 +127,10 @@ If you examine the output directory:
     └── metrics.json
 ```
 
-All of the `*.log` files contain the output from the individual tests. The `metrics.json` file contains all the recorded metrics.
+- The `run.json` file contains the run metadata.
+- The `run.log` file contains the full run log.
+- All of the `target-host/*.log` files contain the output from the individual tests.
+- The `target-host/metrics.json` file contains all the recorded metrics.
 
 ## Examples
 ### Basic Local Benchmark

benchmarks/main.yml

@@ -207,7 +207,7 @@ scripts:
     - for-each: ITERATION ${{=[...Array(${{config.num_iterations}}).keys()]}}
       then:
         - script: sync-drop-fs-cache
-        - sh: /usr/bin/time -p ${{RUNTIME.buildCmd}} 2>&1 >${{REPO_DIR}}/logs/build-times-${{RUNTIME.name}}-${{ITERATION}}.log | grep real | awk '{ print $2}'
+        - sh: /usr/bin/time -p ${{RUNTIME.buildCmd}} 2>&1 >${{REPO_DIR}}/logs/build-times-${{RUNTIME.name}}-${{ITERATION}}.log | grep real | awk '{print $2}'
         - set-state: BUILD_TIME
         - script: state-array-push
           with:
@@ -444,6 +444,7 @@ roles:
       - detect-os
       - capture-os-info
       - start-timestamp
+      - cleanup-env
       - config-env
       - ensure-requirements
       - clone-repo
@@ -455,5 +456,5 @@ roles:
       - stop-timestamp
       - download-metrics
       - stop-test-services
-      - cleanup-env
+#      - cleanup-env
       # - remove-installed-packages

benchmarks/run-benchmarks.sh

@@ -124,7 +124,7 @@ run_benchmarks() {
 
 #  print_values
 
-  jbang qDup@hyperfoil \
+  jbang qDup@hyperfoil --trace="target" \
     -C \
     -b /tmp/ \
     -ix \
@@ -152,8 +152,7 @@ run_benchmarks() {
     -S RUNTIMES="$(make_json_array ${RUNTIMES})" \
     -S PAUSE_TIME=${WAIT_TIME} \
     -S TESTS="$(make_json_array ${TESTS_TO_RUN})" \
-    -S DROP_OS_FILESYSTEM_CACHES=${DROP_OS_FILESYSTEM_CACHES} \
-    --stream-logging
+    -S DROP_OS_FILESYSTEM_CACHES=${DROP_OS_FILESYSTEM_CACHES}
 }
 
 # Define defaults