made workflow jobs separate for node_local_hedera and node_local_ptt …

…test

Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>

.github/workflows/flow-build-application.yaml

@@ -142,18 +142,31 @@ jobs:
       coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-test-subdir }}
       coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-coverage-report }}
 
-  e2e-node-local-build-tests:
+  e2e-node-local-hedera-tests:
     name: E2E Tests
     if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
     uses: ./.github/workflows/zxc-e2e-test.yaml
     needs:
       - env-vars
       - code-style
     with:
-      custom-job-label: Node Local Build
-      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
-      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
-      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-local-build-coverage-report }}
+      custom-job-label: Node Local Hedera
+      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-local-hedera-test-subdir }}
+      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-local-hedera-test-subdir }}
+      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-local-hedera-coverage-report }}
+
+  e2e-node-local-ptt-tests:
+    name: E2E Tests
+    if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
+    uses: ./.github/workflows/zxc-e2e-test.yaml
+    needs:
+      - env-vars
+      - code-style
+    with:
+      custom-job-label: Node Local PTT
+      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-local-ptt-test-subdir }}
+      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-local-ptt-test-subdir }}
+      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-local-ptt-coverage-report }}
 
   e2e-node-add-build-tests:
     name: E2E Tests
@@ -284,7 +297,8 @@ jobs:
       - e2e-node-pem-stop-tests
       - e2e-node-pem-kill-build-tests
       - e2e-node-pem-kill-image-tests
-      - e2e-node-local-build-tests
+      - e2e-node-local-hedera-tests
+      - e2e-node-local-ptt-tests
       - e2e-node-add-build-tests
       - e2e-node-add-image-tests
       - e2e-node-add-local-tests
@@ -307,7 +321,8 @@ jobs:
       e2e-node-pem-stop-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}
       e2e-node-pem-kill-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-build-test-subdir }}
       e2e-node-pem-kill-image-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-test-subdir }}
-      e2e-node-local-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
+      e2e-node-local-hedera-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-hedera-test-subdir }}
+      e2e-node-local-ptt-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-ptt-test-subdir }}
       e2e-node-add-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-build-test-subdir }}
       e2e-node-add-image-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-image-test-subdir }}
       e2e-node-add-local-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-local-test-subdir }}
@@ -323,7 +338,8 @@ jobs:
       e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
       e2e-node-pem-kill-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-build-coverage-report }}
       e2e-node-pem-kill-image-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-coverage-report }}
-      e2e-node-local-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-build-coverage-report }}
+      e2e-node-local-hedera-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-hedera-coverage-report }}
+      e2e-node-local-ptt-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-ptt-coverage-report }}
       e2e-node-add-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-build-coverage-report }}
       e2e-node-add-image-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-image-coverage-report }}
       e2e-node-add-local-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-local-coverage-report }}

.github/workflows/flow-pull-request-checks.yaml

@@ -130,18 +130,31 @@ jobs:
       coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-test-subdir }}
       coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-coverage-report }}
 
-  e2e-node-local-build-tests:
+  e2e-node-local-hedera-tests:
     name: E2E Tests
     if: ${{ !cancelled() && always() }}
     uses: ./.github/workflows/zxc-e2e-test.yaml
     needs:
       - env-vars
       - code-style
     with:
-      custom-job-label: Node Local Build
-      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
-      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
-      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-local-build-coverage-report }}
+      custom-job-label: Node Local Hedera
+      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-local-hedera-test-subdir }}
+      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-local-hedera-test-subdir }}
+      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-local-hedera-coverage-report }}
+
+  e2e-node-local-ptt-tests:
+    name: E2E Tests
+    if: ${{ !cancelled() && always() }}
+    uses: ./.github/workflows/zxc-e2e-test.yaml
+    needs:
+      - env-vars
+      - code-style
+    with:
+      custom-job-label: Node Local PTT
+      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-local-ptt-test-subdir }}
+      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-local-ptt-test-subdir }}
+      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-local-ptt-coverage-report }}
 
   e2e-node-add-build-tests:
     name: E2E Tests
@@ -272,7 +285,8 @@ jobs:
       - e2e-node-pem-stop-tests
       - e2e-node-pem-kill-build-tests
       - e2e-node-pem-kill-image-tests
-      - e2e-node-local-build-tests
+      - e2e-node-local-hedera-tests
+      - e2e-node-local-ptt-tests
       - e2e-node-add-build-tests
       - e2e-node-add-image-tests
       - e2e-node-add-local-tests
@@ -293,7 +307,8 @@ jobs:
       e2e-node-pem-stop-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}
       e2e-node-pem-kill-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-build-test-subdir }}
       e2e-node-pem-kill-image-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-test-subdir }}
-      e2e-node-local-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
+      e2e-node-local-hedera-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-hedera-test-subdir }}
+      e2e-node-local-ptt-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-ptt-test-subdir }}
       e2e-node-add-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-build-test-subdir }}
       e2e-node-add-image-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-image-test-subdir }}
       e2e-node-add-local-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-local-test-subdir }}
@@ -309,7 +324,8 @@ jobs:
       e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
       e2e-node-pem-kill-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-build-coverage-report }}
       e2e-node-pem-kill-image-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-coverage-report }}
-      e2e-node-local-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-build-coverage-report }}
+      e2e-node-local-hedera-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-hedera-coverage-report }}
+      e2e-node-local-ptt-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-ptt-coverage-report }}
       e2e-node-add-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-build-coverage-report }}
       e2e-node-add-image-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-image-coverage-report }}
       e2e-node-add-local-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-local-coverage-report }}
@@ -334,7 +350,8 @@ jobs:
       - e2e-node-pem-stop-tests
       - e2e-node-pem-kill-build-tests
       - e2e-node-pem-kill-image-tests
-      - e2e-node-local-build-tests
+      - e2e-node-local-hedera-tests
+      - e2e-node-local-ptt-tests
       - e2e-node-add-build-tests
       - e2e-node-add-image-tests
       - e2e-node-add-local-tests
@@ -355,7 +372,8 @@ jobs:
       e2e-node-pem-stop-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}
       e2e-node-pem-kill-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-build-test-subdir }}
       e2e-node-pem-kill-image-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-test-subdir }}
-      e2e-node-local-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
+      e2e-node-local-hedera-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-hedera-test-subdir }}
+      e2e-node-local-ptt-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-ptt-test-subdir }}
       e2e-node-add-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-build-test-subdir }}
       e2e-node-add-image-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-image-test-subdir }}
       e2e-node-add-local-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-local-test-subdir }}
@@ -371,7 +389,8 @@ jobs:
       e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
       e2e-node-pem-kill-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-build-coverage-report }}
       e2e-node-pem-kill-image-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-image-coverage-report }}
-      e2e-node-local-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-build-coverage-report }}
+      e2e-node-local-hedera-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-hedera-coverage-report }}
+      e2e-node-local-ptt-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-ptt-coverage-report }}
       e2e-node-add-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-build-coverage-report }}
       e2e-node-add-image-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-image-coverage-report }}
       e2e-node-add-local-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-local-coverage-report }}

.github/workflows/templates/config.yaml

@@ -15,8 +15,10 @@ tests:
     jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_pem_kill_build\\.test\\.mjs\"
   - name: Node PEM Kill Image
     jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_pem_kill_image\\.test\\.mjs\"
-  - name: Node Local Build
-    jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_local.*\\.test\\.mjs\"
+  - name: Node Local Hedera
+    jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_local_hedera.*\\.test\\.mjs\"
+  - name: Node Local PTT
+    jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_local_ptt.*\\.test\\.mjs\"
   - name: Node Add Build
     jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_add_build.*\\.test\\.mjs\"
   - name: Node Add Image

.github/workflows/zxc-code-analysis.yaml

@@ -85,11 +85,16 @@ on:
         type: string
         required: false
         default: "e2e-node-pem-kill-image"
-      e2e-node-local-build-test-subdir:
-        description: "E2E Node Local Build Test Subdirectory:"
+      e2e-node-local-hedera-test-subdir:
+        description: "E2E Node Local Hedera Test Subdirectory:"
         type: string
         required: false
-        default: "e2e-node-local-build"
+        default: "e2e-node-local-hedera"
+      e2e-node-local-ptt-test-subdir:
+        description: "E2E Node Local PTT Test Subdirectory:"
+        type: string
+        required: false
+        default: "e2e-node-local-ptt"
       e2e-node-add-build-test-subdir:
         description: "E2E Node Add Build Test Subdirectory:"
         type: string
@@ -165,11 +170,16 @@ on:
         type: string
         required: false
         default: "E2E Node PEM Kill Image Tests Coverage Report"
-      e2e-node-local-build-coverage-report:
-        description: "E2E Node Local Build Coverage Report:"
+      e2e-node-local-hedera-coverage-report:
+        description: "E2E Node Local Hedera Coverage Report:"
+        type: string
+        required: false
+        default: "E2E Node Local Hedera Tests Coverage Report"
+      e2e-node-local-ptt-coverage-report:
+        description: "E2E Node Local PTT Coverage Report:"
         type: string
         required: false
-        default: "E2E Node Local Build Tests Coverage Report"
+        default: "E2E Node Local PTT Tests Coverage Report"
       e2e-node-add-build-coverage-report:
         description: "E2E Node Add Build Coverage Report:"
         type: string
@@ -307,12 +317,19 @@ jobs:
           name: ${{ inputs.e2e-node-pem-kill-image-coverage-report }}
           path: 'coverage/${{ inputs.e2e-node-pem-kill-image-test-subdir }}'
 
-      - name: Download E2E Node Local Build Coverage Report
+      - name: Download E2E Node Local Hedera Coverage Report
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
+        with:
+          name: ${{ inputs.e2e-node-local-hedera-coverage-report }}
+          path: 'coverage/${{ inputs.e2e-node-local-hedera-test-subdir }}'
+
+      - name: Download E2E Node Local PTT Coverage Report
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
         with:
-          name: ${{ inputs.e2e-node-local-build-coverage-report }}
-          path: 'coverage/${{ inputs.e2e-node-local-build-test-subdir }}'
+          name: ${{ inputs.e2e-node-local-ptt-coverage-report }}
+          path: 'coverage/${{ inputs.e2e-node-local-ptt-test-subdir }}'
 
       - name: Download E2E Node Add Build Coverage Report
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

.github/workflows/zxc-e2e-test.yaml

@@ -147,20 +147,20 @@ jobs:
         run: docker image pull kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
 
       - name: Setup Java
-        if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-build' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
+        if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-hedera' || inputs.npm-test-script == 'test-e2e-node-local-ptt' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
         uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
         with:
           distribution: temurin
           java-version: 21.0.1
 
       - name: Setup Gradle
-        if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-build' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
+        if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-hedera' || inputs.npm-test-script == 'test-e2e-node-local-ptt' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
         uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
         with:
           cache-read-only: false
 
       - name: Build Hedera code locally
-        if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-build' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
+        if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-hedera' || inputs.npm-test-script == 'test-e2e-node-local-ptt' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
         run: |
           cd ..
           git clone https://github.com/hashgraph/hedera-services.git --depth 1 --branch v0.54.0-alpha.4
@@ -179,7 +179,7 @@ jobs:
           ${{ env.CG_EXEC }} npm run ${{ inputs.npm-test-script }}
 
       - name: RPC relay smoke test
-        if: ${{ runner.os == 'linux' && inputs.npm-test-script == 'test-e2e-relay' && !cancelled() && !failure() }}
+        if: ${{ runner.os == 'linux' && inputs.npm-test-script == 'test-e2e-relay-build' && !cancelled() && !failure() }}
         run: |
           echo "Skipped smoke test for relay"
           #.github/workflows/script/relay_smoke_test.sh

.github/workflows/zxc-env-vars.yaml

@@ -44,9 +44,12 @@ on:
       e2e-node-pem-kill-image-test-subdir:
         description: "E2E Node PEM Kill Image Test Subdirectory"
         value: ${{ jobs.env-vars.outputs.e2e_node_pem_kill_image_test_subdir }}
-      e2e-node-local-build-test-subdir:
-        description: "E2E Node Local Build Test Subdirectory"
-        value: ${{ jobs.env-vars.outputs.e2e_node_local_build_test_subdir }}
+      e2e-node-local-hedera-test-subdir:
+        description: "E2E Node Local Hedera Test Subdirectory"
+        value: ${{ jobs.env-vars.outputs.e2e_node_local_hedera_test_subdir }}
+      e2e-node-local-ptt-test-subdir:
+        description: "E2E Node Local PTT Test Subdirectory"
+        value: ${{ jobs.env-vars.outputs.e2e_node_local_ptt_test_subdir }}
       e2e-node-add-build-test-subdir:
         description: "E2E Node Add Build Test Subdirectory"
         value: ${{ jobs.env-vars.outputs.e2e_node_add_build_test_subdir }}
@@ -92,9 +95,12 @@ on:
       e2e-node-pem-kill-image-coverage-report:
         description: "E2E Node PEM Kill Image Tests Coverage Report"
         value: ${{ jobs.env-vars.outputs.e2e_node_pem_kill_image_coverage_report }}
-      e2e-node-local-build-coverage-report:
-        description: "E2E Node Local Build Tests Coverage Report"
-        value: ${{ jobs.env-vars.outputs.e2e_node_local_build_coverage_report }}
+      e2e-node-local-hedera-coverage-report:
+        description: "E2E Node Local Hedera Tests Coverage Report"
+        value: ${{ jobs.env-vars.outputs.e2e_node_local_hedera_coverage_report }}
+      e2e-node-local-ptt-coverage-report:
+        description: "E2E Node Local PTT Tests Coverage Report"
+        value: ${{ jobs.env-vars.outputs.e2e_node_local_ptt_coverage_report }}
       e2e-node-add-build-coverage-report:
         description: "E2E Node Add Build Tests Coverage Report"
         value: ${{ jobs.env-vars.outputs.e2e_node_add_build_coverage_report }}
@@ -138,7 +144,8 @@ jobs:
       e2e_node_pem_stop_test_subdir: e2e-node-pem-stop
       e2e_node_pem_kill_build_test_subdir: e2e-node-pem-kill-build
       e2e_node_pem_kill_image_test_subdir: e2e-node-pem-kill-image
-      e2e_node_local_build_test_subdir: e2e-node-local-build
+      e2e_node_local_hedera_test_subdir: e2e-node-local-hedera
+      e2e_node_local_ptt_test_subdir: e2e-node-local-ptt
       e2e_node_add_build_test_subdir: e2e-node-add-build
       e2e_node_add_image_test_subdir: e2e-node-add-image
       e2e_node_add_local_test_subdir: e2e-node-add-local
@@ -154,7 +161,8 @@ jobs:
       e2e_node_pem_stop_coverage_report: "E2E Node PEM Stop Tests Coverage Report"
       e2e_node_pem_kill_build_coverage_report: "E2E Node PEM Kill Build Tests Coverage Report"
       e2e_node_pem_kill_image_coverage_report: "E2E Node PEM Kill Image Tests Coverage Report"
-      e2e_node_local_build_coverage_report: "E2E Node Local Build Tests Coverage Report"
+      e2e_node_local_hedera_coverage_report: "E2E Node Local Hedera Tests Coverage Report"
+      e2e_node_local_ptt_coverage_report: "E2E Node Local PTT Tests Coverage Report"
       e2e_node_add_build_coverage_report: "E2E Node Add Build Tests Coverage Report"
       e2e_node_add_image_coverage_report: "E2E Node Add Image Tests Coverage Report"
       e2e_node_add_local_coverage_report: "E2E Node Add Local Tests Coverage Report"