Merge pull request ethereum#599 from maticnetwork/raneet10/pos-534

CI: Optimize devnet setup
streamingfast · Nov 30, 2022 · ba58225 · ba58225
2 parents b1739f6 + 806ed05
commit ba58225
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -142,11 +142,11 @@ jobs:
             bash docker-heimdall-start-all.sh
             bash docker-bor-setup.sh
             bash docker-bor-start-all.sh
-            sleep 120 && bash ganache-deployment-bor.sh
-            sleep 120 && bash ganache-deployment-sync.sh
-            sleep 120
-            docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'admin.peers'"
-            docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'eth.blockNumber'"
+            cd -
+            timeout 2m bash bor/integration-tests/bor_health.sh
+            cd -
+            bash ganache-deployment-bor.sh
+            bash ganache-deployment-sync.sh
 
         - name: Run smoke tests
           run: |

diff --git a/integration-tests/bor_health.sh b/integration-tests/bor_health.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+while true
+do
+    peers=$(docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'admin.peers'")
+    block=$(docker exec bor0 bash -c "bor attach /root/.bor/data/bor.ipc -exec 'eth.blockNumber'")
+
+    if [[ -n "$peers" ]] && [[ -n "$block" ]]; then
+        break
+    fi
+done
+
+echo $peers
+echo $block