fix script output

smartcontractkit · Mar 7, 2024 · afc0b4a · afc0b4a
1 parent d2cf886
commit afc0b4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/evm-version-compatibility-tests.yml b/.github/workflows/evm-version-compatibility-tests.yml
@@ -39,9 +39,6 @@ jobs:
             echo "No relevant dependency bump detected."
             echo "dependency_bumped=false" >> "$GITHUB_OUTPUT"
           fi
-          cat "$GITHUB_OUTPUT"
-      - name: Confirm output
-        run: cat "$GITHUB_OUTPUT"
 
   # Build Test Dependencies
 
@@ -130,8 +127,9 @@ jobs:
         id: decode-base64-test-list
         if: env.BASE64_TEST_LIST != ''
         run: |
-          echo "Decoding test_input..."
+          echo "Decoding base64 test list..."
           DECODED_BASE64_TEST_LIST=$(echo $BASE64_TEST_LIST | base64 -d)
+          echo $DECODED_BASE64_TEST_LIST
           cd ./integration-tests
           echo $DECODED_BASE64_TEST_LIST >> ./evm_node_compatibility_test_list.json
 
@@ -142,8 +140,8 @@ jobs:
           cd ./integration-tests
           cp ./smoke/evm_node_compatibility_test_list.json .
 
-      - name: Set Matrix from Decoded Input
-        id: set-test-matrix-list
+      - name: Create Test Matrix
+        id: create-test-matrix-list
         run: |
           cd ./integration-tests
           JOB_MATRIX_JSON=$(./scripts/buildEvmClientTestMatrixList.sh ./evm_node_compatibility_test_list.json ubuntu-latest)

diff --git a/integration-tests/scripts/buildEvmClientTestMatrixList.sh b/integration-tests/scripts/buildEvmClientTestMatrixList.sh
@@ -26,7 +26,7 @@ matrix_output() {
   local docker_image=$6
   local product=$7
   local counter_out=$(printf "%02d\n" $counter)
-  echo -n "{\"name\": \"${job_name}-${counter_out}\", \"os\": \"${node_label}\", \"eth_client\": \"${eth_client}\", \"docker_image\": \"${docker_image}\", \"run\": \"-run '^${test_name}$'\"}"
+  echo -n "{\"name\": \"${job_name}-${counter_out}\", \"os\": \"${node_label}\", \"product\": \"${product}\", \"eth_client\": \"${eth_client}\", \"docker_image\": \"${docker_image}\", \"run\": \"-run '^${test_name}$'\"}"
 }
 
 # Read the JSON file and loop through 'tests' and 'run'
@@ -36,8 +36,8 @@ jq -c '.tests[]' ${JSONFILE} | while read -r test; do
   effective_node_label=${label:-$NODE_LABEL}
   eth_client=$(echo ${test} | jq -r '.eth_client')
   docker_image=$(echo ${test} | jq -r '.docker_image')
-  subTests=$(echo ${test} | jq -r '.run[]?.name // empty')
   product=$(echo ${test} | jq -r '.product')
+  subTests=$(echo ${test} | jq -r '.run[]?.name // empty')
   output=""
 
   if [ $COUNTER -ne 1 ]; then