Merge branch 'develop' into fixLiveTestReporting

.github/workflows/client-compatibility-tests.yml

@@ -37,15 +37,15 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       - name: Build Chainlink Image
         uses: ./.github/actions/build-chainlink-image
-        with: 
+        with:
           tag_suffix: ""
           dockerfile: core/chainlink.Dockerfile
           git_commit_sha: ${{ github.sha }}
           GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
           GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
-  
+
   build-tests:
     environment: integration
     permissions:
@@ -102,51 +102,49 @@ jobs:
             file: ocr
             client: geth
             timeout: 30m
-            pyroscope_env: ci-smoke-ocr-geth-simulated         
-          # Uncomment, when https://smartcontract-it.atlassian.net/browse/TT-753 is DONE
-          # - name: ocr-nethermind
-          #   test: TestOCRBasic
-          #   file: ocr
-          #   client: nethermind
-          #   timeout: 30m
-          #   pyroscope_env: ci-smoke-ocr-nethermind-simulated                          
+            pyroscope_env: ci-smoke-ocr-geth-simulated
+          - name: ocr-nethermind
+            test: TestOCRBasic
+            file: ocr
+            client: nethermind
+            timeout: 30m
+            pyroscope_env: ci-smoke-ocr-nethermind-simulated
           - name: ocr-besu
             test: TestOCRBasic
             file: ocr
             client: besu
             timeout: 30m
-            pyroscope_env: ci-smoke-ocr-besu-simulated        
+            pyroscope_env: ci-smoke-ocr-besu-simulated
           - name: ocr-erigon
             test: TestOCRBasic
             file: ocr
             client: erigon
             timeout: 30m
-            pyroscope_env: ci-smoke-ocr-erigon-simulated         
+            pyroscope_env: ci-smoke-ocr-erigon-simulated
           - name: ocr2-geth
-            test: TestOCRv2Basic
+            test: "^TestOCRv2Basic/plugins$"
             file: ocr2
             client: geth
             timeout: 30m
-            pyroscope_env: ci-smoke-ocr2-geth-simulated            
-          # Uncomment, when https://smartcontract-it.atlassian.net/browse/TT-753 is DONE            
-          # - name: ocr2-nethermind
-          #   test: TestOCRv2Basic
-          #   file: ocr2
-          #   client: nethermind
-          #   timeout: 30m
-          #   pyroscope_env: ci-smoke-nethermind-evm-simulated                         
+            pyroscope_env: ci-smoke-ocr2-geth-simulated
+          - name: ocr2-nethermind
+            test: "^TestOCRv2Basic/plugins$"
+            file: ocr2
+            client: nethermind
+            timeout: 30m
+            pyroscope_env: ci-smoke-nethermind-evm-simulated
           - name: ocr2-besu
-            test: TestOCRv2Basic
+            test: "^TestOCRv2Basic/plugins$"
             file: ocr2
             client: besu
-            timeout: 30m 
-            pyroscope_env: ci-smoke-ocr2-besu-simulated      
+            timeout: 30m
+            pyroscope_env: ci-smoke-ocr2-besu-simulated
           - name: ocr2-erigon
-            test: TestOCRv2Basic
+            test: "^TestOCRv2Basic/plugins$"
             file: ocr2
             client: erigon
             timeout: 60m
-            pyroscope_env: ci-smoke-ocr2-erigon-simulated                           
+            pyroscope_env: ci-smoke-ocr2-erigon-simulated
     runs-on: ubuntu-latest
     name: Client Compatibility Test ${{ matrix.name }}
     steps:
@@ -175,8 +173,8 @@ jobs:
               toml_array_format="${toml_array_format%,}]"
               echo "$toml_array_format"
           }
-        
-          selected_networks=$(convert_to_toml_array "$SELECTED_NETWORKS")          
+
+          selected_networks=$(convert_to_toml_array "$SELECTED_NETWORKS")
 
           if [ -n "$ETH2_EL_CLIENT" ]; then
             execution_layer="$ETH2_EL_CLIENT"
@@ -188,12 +186,12 @@ jobs:
             pyroscope_enabled=true
           else
             pyroscope_enabled=false
-          fi          
+          fi
 
           cat << EOF > config.toml
           [Network]
           selected_networks=$selected_networks
-          
+
           [ChainlinkImage]
           image="$CHAINLINK_IMAGE"
           version="$CHAINLINK_VERSION"
@@ -218,7 +216,7 @@ jobs:
           slots_per_epoch=2
           addresses_to_fund=["0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"]
           EOF
-          
+
           BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)
           echo ::add-mask::$BASE64_CONFIG_OVERRIDE
           echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
@@ -240,7 +238,7 @@ jobs:
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
-    
+
   start-slack-thread:
     name: Start Slack Thread
     if: ${{ always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}