update local-node start

Signed-off-by: Iliya Savov <[email protected]>
isavov · Nov 30, 2023 · 6af67a3 · 6af67a3
1 parent 72ee1b3
commit 6af67a3
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 21 deletions.
diff --git a/.github/workflows/acceptance-workflow.yml b/.github/workflows/acceptance-workflow.yml
@@ -34,7 +34,7 @@ jobs:
           node-version: 18
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install packages
         run: npm ci
@@ -48,18 +48,50 @@ jobs:
       - name: Build Typescript
         run: npx lerna run build
 
+      - name: Install hedera local
+        run: npm install @hashgraph/hedera-local -g
+
       - name: Set operator id and key env variable if CI is manual
         if: ${{ inputs.operator_id }}
         run: |
           echo "OPERATOR_ID_MAIN=${{ inputs.operator_id }}" >> $GITHUB_ENV
           echo "OPERATOR_KEY_MAIN=${{ inputs.operator_key }}" >> $GITHUB_ENV
 
+      # - name: Setup upterm session
+      #   uses: lhotari/action-upterm@v1
+      #   with:
+      #     ## limits ssh access and adds the ssh public key for the user which triggered the workflow
+      #     limit-access-to-actor: true
+
+      - name: Run hedera local
+        run: hedera restart -d
+
+      - name: Stop  relay
+        run: |
+          docker stop json-rpc-relay json-rpc-relay-ws
+
+      # - name: Run hedera local
+      #   run: hedera restart -d
+
+      # - name: Stop  relay
+      #   run: |
+      #     docker stop json-rpc-relay json-rpc-relay-ws
+
+      # - name: Run hedera local
+      #   run: hedera restart -d
+
+      # - name: Stop  relay
+      #   run: |
+      #     docker stop json-rpc-relay json-rpc-relay-ws
+
       - name: Run acceptance tests
         uses: nick-fields/retry@v2
         with:
           max_attempts: 3
           timeout_minutes: 20
           command: npm run acceptancetest:${{ inputs.testfilter }}
+          on_retry_command: scripts/retry_script.sh
+
         env:
           TEST_WS_SERVER: ${{ inputs.test_ws_server }}
           SUBSCRIPTIONS_ENABLED: ${{ inputs.test_ws_server }}
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/server/tests/acceptance/index.spec.ts b/packages/server/tests/acceptance/index.spec.ts
@@ -87,7 +87,7 @@ describe('RPC Server Acceptance Tests', function () {
     logger.info(`E2E_RELAY_HOST: ${process.env.E2E_RELAY_HOST}`);
 
     if (USE_LOCAL_NODE === 'true') {
-      runLocalHederaNetwork();
+      // runLocalHederaNetwork();
     }
 
     if (global.relayIsLocal) {
@@ -106,7 +106,7 @@ describe('RPC Server Acceptance Tests', function () {
     if (USE_LOCAL_NODE === 'true') {
       // stop local-node
       logger.info('Shutdown local node');
-      shell.exec('hedera stop');
+      //shell.exec('hedera stop');
     }
 
     //stop relay
@@ -138,23 +138,23 @@ describe('RPC Server Acceptance Tests', function () {
     }
   }
 
-  function runLocalHederaNetwork() {
-    // set env variables for docker images until local-node is updated
-    process.env['NETWORK_NODE_IMAGE_TAG'] = '0.45.0-alpha.0';
-    process.env['HAVEGED_IMAGE_TAG'] = '0.45.0-alpha.0';
-    process.env['MIRROR_IMAGE_TAG'] = '0.92.0';
+  // function runLocalHederaNetwork() {
+  //   // set env variables for docker images until local-node is updated
+  //   process.env['NETWORK_NODE_IMAGE_TAG'] = '0.45.0-alpha.0';
+  //   process.env['HAVEGED_IMAGE_TAG'] = '0.45.0-alpha.0';
+  //   process.env['MIRROR_IMAGE_TAG'] = '0.92.0';
 
-    console.log(
-      `Docker container versions, services: ${process.env['NETWORK_NODE_IMAGE_TAG']}, mirror: ${process.env['MIRROR_IMAGE_TAG']}`,
-    );
+  //   console.log(
+  //     `Docker container versions, services: ${process.env['NETWORK_NODE_IMAGE_TAG']}, mirror: ${process.env['MIRROR_IMAGE_TAG']}`,
+  //   );
 
-    console.log('Installing local node...');
-    shell.exec(`npm install @hashgraph/hedera-local -g`);
+  //   console.log('Installing local node...');
+  //   shell.exec(`npm install @hashgraph/hedera-local -g`);
 
-    console.log('Starting local node...');
-    shell.exec(`hedera start -d`);
-    console.log('Hedera Hashgraph local node env started');
-  }
+  //   console.log('Starting local node...');
+  //   shell.exec(`hedera start -d`);
+  //   console.log('Hedera Hashgraph local node env started');
+  // }
 
   function runLocalRelay() {
     // start local relay, stop relay instance in local

diff --git a/scripts/retry_script.sh b/scripts/retry_script.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -v
+set +e
+hedera stop
+sleep 5
+ls -lah $(dirname $(readlink -f $(which hedera)))/../network-logs
+sudo rm -rf $(dirname $(readlink -f $(which hedera)))/../network-logs
+sleep 5
+hedera restart -d
+docker stop json-rpc-relay json-rpc-relay-ws