Workflow fixes (#171)

* Workflow fixes * Small fixеs * Enable London fork; Disable bridge
Ethernal-Tech · Mar 28, 2024 · 18ed872 · 18ed872
1 parent 307c7bb
commit 18ed872
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
@@ -97,6 +97,9 @@ on: # yamllint disable-line rule:truthy
       iterations:
         description: "Number Of Transactions"
         value: ${{ jobs.load_test_scenario.outputs.iterations }}
+      dropped_iterations:
+        description: "Number Of Dropped Transactions"
+        value: ${{ jobs.load_test_scenario.outputs.dropped_iterations }}
       block:
         description: "Block Number"
         value: ${{ jobs.load_test_scenario.outputs.block }}
@@ -187,6 +190,7 @@ jobs:
       tps_avg: ${{ steps.load_test_results.outputs.tps_avg }}
       tps_max: ${{ steps.load_test_results.outputs.tps_max }}
       iterations: ${{ steps.load_test_results.outputs.iterations }}
+      dropped_iterations: ${{ steps.load_test_results.outputs.dropped_iterations }}
       block: ${{ steps.load_test_results.outputs.block }}
       ttm: ${{ steps.load_test_results.outputs.ttm }}
       gas_avg: ${{ steps.load_test_results.outputs.gas_avg }}
@@ -201,6 +205,7 @@ jobs:
           echo "tps_avg=$(cat summary.json | jq -r '.metrics.ethereum_tps.values.avg')" >> $GITHUB_OUTPUT
           echo "tps_max=$(cat summary.json | jq -r '.metrics.ethereum_tps.values.max')" >> $GITHUB_OUTPUT
           echo "iterations=$(cat summary.json | jq -r '.metrics.iterations.values.count')" >> $GITHUB_OUTPUT
+          echo "dropped_iterations=$(cat summary.json | jq -r '.metrics.dropped_iterations.values.count')" >> $GITHUB_OUTPUT
           echo "block=$(cat summary.json | jq -r '.metrics.ethereum_block.values.count')" >> $GITHUB_OUTPUT
           echo "ttm=$(cat summary.json | jq -r '.metrics.ethereum_time_to_mine.values.avg')" >> $GITHUB_OUTPUT
           echo "gas_avg=$(cat summary.json | jq -r '.metrics.ethereum_gas_used.values.avg')" >> $GITHUB_OUTPUT
@@ -236,6 +241,7 @@ jobs:
       tps_avg: ${{ needs.load_test_scenario.outputs.tps_avg }}
       tps_max: ${{ needs.load_test_scenario.outputs.tps_max }}
       iterations: ${{ needs.load_test_scenario.outputs.iterations }}
+      dropped_iterations: ${{ needs.load_test_scenario.outputs.dropped_iterations }}
       block: ${{ needs.load_test_scenario.outputs.block }}
       ttm: ${{ needs.load_test_scenario.outputs.ttm }}
       gas_avg: ${{ needs.load_test_scenario.outputs.gas_avg }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -48,8 +48,8 @@ jobs:
       block_time: "2"
       max_slots: "276480"
       max_enqueued: "276480"
-      is_london_fork_active: false
-      is_bridge_active: true
+      is_london_fork_active: true
+      is_bridge_active: false
       notification: false
     secrets:
       AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
@@ -125,8 +125,8 @@ jobs:
       block_time: "2"
       max_slots: "276480"
       max_enqueued: "276480"
-      is_london_fork_active: false
-      is_bridge_active: true
+      is_london_fork_active: true
+      is_bridge_active: false
       logs: true
       build_blade_output: ${{ needs.ci.outputs.build-blade }}
       lint_output: ${{ needs.ci.outputs.lint }}
@@ -153,9 +153,16 @@ jobs:
     with:
       environment: nightly
       scenario: EOA
+      timeout: "1800s"
+      rate: "3000"
+      timeUnit: "1s"
+      duration: "10m"
+      preAllocatedVUs: "60"
+      maxVUs: "60"
       tps_avg: ${{ needs.load_test_multiple_eoa.outputs.tps_avg }}
       tps_max: ${{ needs.load_test_multiple_eoa.outputs.tps_max }}
       iterations: ${{ needs.load_test_multiple_eoa.outputs.iterations }}
+      dropped_iterations: ${{ needs.load_test_multiple_eoa.outputs.dropped_iterations }}
       block: ${{ needs.load_test_multiple_eoa.outputs.block }}
       ttm: ${{ needs.load_test_multiple_eoa.outputs.ttm }}
       gas_avg: ${{ needs.load_test_multiple_eoa.outputs.gas_avg }}
@@ -170,9 +177,16 @@ jobs:
     with:
       environment: nightly
       scenario: ERC20
+      timeout: "1800s"
+      rate: "1500"
+      timeUnit: "1s"
+      duration: "10m"
+      preAllocatedVUs: "60"
+      maxVUs: "60"
       tps_avg: ${{ needs.load_test_multiple_erc20.outputs.tps_avg }}
       tps_max: ${{ needs.load_test_multiple_erc20.outputs.tps_max }}
       iterations: ${{ needs.load_test_multiple_erc20.outputs.iterations }}
+      dropped_iterations: ${{ needs.load_test_multiple_erc20.outputs.dropped_iterations }}
       block: ${{ needs.load_test_multiple_erc20.outputs.block }}
       ttm: ${{ needs.load_test_multiple_erc20.outputs.ttm }}
       gas_avg: ${{ needs.load_test_multiple_erc20.outputs.gas_avg }}

diff --git a/.github/workflows/notification-load-test.yml b/.github/workflows/notification-load-test.yml
@@ -47,6 +47,10 @@ on: # yamllint disable-line rule:truthy
         description: "Number Of Transactions"
         type: string
         required: true
+      dropped_iterations:
+        description: "Number Of Dropped Transactions"
+        type: string
+        required: true
       block:
         description: "Block Number"
         type: string
@@ -191,6 +195,10 @@ jobs:
                       "type": "mrkdwn",
                       "text": "*Transactions*\n${{ inputs.iterations }}"
                     },
+                    {
+                      "type": "mrkdwn",
+                      "text": "*Dropped Transactions*\n${{ inputs.dropped_iterations }}"
+                    },
                     {
                       "type": "mrkdwn",
                       "text": "*Block Number*\n${{ inputs.block }}"