Merge branch 'develop' into BCF-2612-ChainReader-Next

.github/workflows/ci-chaincli.yml

@@ -2,11 +2,7 @@ name: chaincli CI
 
 on:
   push:
-    paths:
-      - "core/scripts/chaincli/**"
   pull_request:
-    paths:
-      - "core/scripts/chaincli/**"
 
 jobs:
   golangci:

.github/workflows/integration-tests.yml

@@ -325,11 +325,73 @@ jobs:
           - name: ocr
             nodes: 1
             os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRJobReplacement
+            file: ocr
             pyroscope_env: ci-smoke-ocr-evm-simulated
+          - name: ocr-geth
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRBasic
+            file: ocr
+            client: geth
+            pyroscope_env: ci-smoke-ocr-evm-simulated         
+          # Uncomment, when https://smartcontract-it.atlassian.net/browse/TT-753 is DONE
+          # - name: ocr-nethermind
+          #   nodes: 1
+          #   os: ubuntu20.04-8cores-32GB
+          #   run: -run TestOCRBasic
+          #   file: ocr
+          #   client: nethermind
+          #   pyroscope_env: ci-smoke-ocr-evm-simulated                          
+          - name: ocr-besu
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRBasic
+            file: ocr
+            client: besu
+            pyroscope_env: ci-smoke-ocr-evm-simulated        
+          - name: ocr-erigon
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRBasic
+            file: ocr
+            client: erigon
+            pyroscope_env: ci-smoke-ocr-evm-simulated         
           - name: ocr2
             nodes: 1
             os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2JobReplacement
+            file: ocr2
             pyroscope_env: ci-smoke-ocr2-evm-simulated
+          - name: ocr2-geth
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2Basic
+            file: ocr2
+            client: geth
+            pyroscope_env: ci-smoke-ocr2-evm-simulated            
+          # Uncomment, when https://smartcontract-it.atlassian.net/browse/TT-753 is DONE            
+          # - name: ocr2-nethermind
+          #   nodes: 1
+          #   os: ubuntu20.04-8cores-32GB
+          #   run: -run TestOCRv2Basic
+          #   file: ocr2
+          #   client: nethermind
+          #   pyroscope_env: ci-smoke-ocr2-evm-simulated                         
+          - name: ocr2-besu
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2Basic
+            file: ocr2
+            client: besu            
+            pyroscope_env: ci-smoke-ocr2-evm-simulated      
+          - name: ocr2-erigon
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2Basic
+            file: ocr2
+            client: erigon            
+            pyroscope_env: ci-smoke-ocr2-evm-simulated                           
           - name: ocr2
             nodes: 1
             os: ubuntu20.04-8cores-32GB
@@ -345,12 +407,14 @@ jobs:
             pyroscope_env: ci-smoke-vrf-evm-simulated
           - name: vrfv2
             nodes: 1
+            run: -run TestVRFv2MultipleSendingKeys
+            file: vrfv2            
             os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
             nodes: 1
             os: ubuntu20.04-8cores-32GB
-            pyroscope_env: ci-smoke-vrf2plus-evm-simulated
+            pyroscope_env: ci-smoke-vrf2plus-evm-simulated                       
           - name: forwarder_ocr
             nodes: 1
             os: ubuntu20.04-8cores-32GB
@@ -435,6 +499,14 @@ jobs:
           PYROSCOPE_SERVER: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           PYROSCOPE_ENVIRONMENT: ${{ matrix.product.pyroscope_env }}
           PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+          ETH2_EL_CLIENT: ${{matrix.product.client}}
+          LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          LOKI_URL: ${{ secrets.LOKI_URL }}
+          LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          LOGSTREAM_LOG_TARGETS: ${{ vars.LOGSTREAM_LOG_TARGETS }}
+          GRAFANA_URL: ${{ vars.GRAFANA_URL }}
+          GRAFANA_DATASOURCE: ${{ vars.GRAFANA_DATASOURCE }}
+          RUN_ID: ${{ github.run_id }}
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -487,6 +559,27 @@ jobs:
         with:
           name: trace-data
           path: ./integration-tests/smoke/traces/trace-data.json
+      - name: Print failed test summary
+        if: always()
+        run: |
+          directory="./integration-tests/smoke/.test_summary"
+          files=("$directory"/*)
+          if [ -d "$directory" ]; then
+            echo "Test summary folder found"
+            if [ ${#files[@]} -gt 0 ]; then
+              first_file="${files[0]}"
+              echo "Name of the first test summary file: $(basename "$first_file")"
+              echo "### Failed Test Execution Logs Dashboard (over VPN):" >> $GITHUB_STEP_SUMMARY
+              cat "$first_file" | jq -r '.loki[] | "* [\(.test_name)](\(.value))"' >> $GITHUB_STEP_SUMMARY
+              if [ ${#files[@]} -gt 1 ]; then
+                echo "Found more than one test summary file. This is incorrect, there should be only one file"
+              fi
+            else
+                echo "Test summary directory is empty. This should not happen"
+            fi
+          else
+            echo "No test summary folder found. If no test failed or log collection wasn't explicitly requested this is correct. Exiting"
+          fi
 
   ### Used to check the required checks box when the matrix completes
   eth-smoke-tests: