Skip to content

Commit b251276

Browse files
Ivo-YankovJeffreyDallas
Ivo-Yankov
and
JeffreyDallas
authored
feat: separate commands for solo node delete (#597)
Signed-off-by: Ivo Yankov <[email protected]> Signed-off-by: Jeffrey Tang <[email protected]> Co-authored-by: Jeffrey Tang <[email protected]>
1 parent 538e40d commit b251276

11 files changed

+644
-246
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,19 @@ jobs:
181181
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
182182
coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
183183

184+
e2e-node-delete-separate-commands-tests:
185+
name: E2E Tests
186+
if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
187+
uses: ./.github/workflows/zxc-e2e-test.yaml
188+
needs:
189+
- env-vars
190+
- code-style
191+
with:
192+
custom-job-label: Node Delete - Separate commands
193+
npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
194+
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
195+
coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
196+
184197
e2e-relay-tests:
185198
name: E2E Tests
186199
if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
@@ -209,6 +222,7 @@ jobs:
209222
- e2e-node-add-separate-commands-tests
210223
- e2e-node-update-tests
211224
- e2e-node-delete-tests
225+
- e2e-node-delete-separate-commands-tests
212226
- e2e-relay-tests
213227
if: ${{ (github.event_name == 'push' || github.event.inputs.enable-unit-tests == 'true' || github.event.inputs.enable-e2e-tests == 'true') && !failure() && !cancelled() }}
214228
with:
@@ -226,6 +240,7 @@ jobs:
226240
e2e-node-add-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-test-subdir }}
227241
e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
228242
e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
243+
e2e-node-delete-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
229244
e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
230245
e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
231246
e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
@@ -236,6 +251,7 @@ jobs:
236251
e2e-node-add-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-coverage-report }}
237252
e2e-node-update-coverage-report: ${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}
238253
e2e-node-delete-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
254+
e2e-node-delete-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
239255
e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
240256
secrets:
241257
snyk-token: ${{ secrets.SNYK_TOKEN }}

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,19 @@ jobs:
179179
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
180180
coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
181181

182+
e2e-node-delete-separate-commands-tests:
183+
name: E2E Tests
184+
if: ${{ !cancelled() && always() }}
185+
uses: ./.github/workflows/zxc-e2e-test.yaml
186+
needs:
187+
- env-vars
188+
- code-style
189+
with:
190+
custom-job-label: Node Delete - Separate commands
191+
npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
192+
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
193+
coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
194+
182195
e2e-relay-tests:
183196
name: E2E Tests
184197
if: ${{ !cancelled() && always() }}
@@ -207,6 +220,7 @@ jobs:
207220
- e2e-node-add-separate-commands-tests
208221
- e2e-node-update-tests
209222
- e2e-node-delete-tests
223+
- e2e-node-delete-separate-commands-tests
210224
- e2e-relay-tests
211225
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
212226
with:
@@ -222,6 +236,7 @@ jobs:
222236
e2e-node-add-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-test-subdir }}
223237
e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
224238
e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
239+
e2e-node-delete-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
225240
e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
226241
e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
227242
e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
@@ -232,6 +247,7 @@ jobs:
232247
e2e-node-add-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-coverage-report }}
233248
e2e-node-update-coverage-report: ${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}
234249
e2e-node-delete-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
250+
e2e-node-delete-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
235251
e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
236252
secrets:
237253
codecov-token: ${{ secrets.CODECOV_TOKEN }}
@@ -251,6 +267,7 @@ jobs:
251267
- e2e-node-add-separate-commands-tests
252268
- e2e-node-update-tests
253269
- e2e-node-delete-tests
270+
- e2e-node-delete-separate-commands-tests
254271
- e2e-relay-tests
255272
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
256273
with:
@@ -266,6 +283,7 @@ jobs:
266283
e2e-node-add-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-test-subdir }}
267284
e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
268285
e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
286+
e2e-node-delete-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
269287
e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
270288
e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
271289
e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
@@ -276,6 +294,7 @@ jobs:
276294
e2e-node-add-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-coverage-report }}
277295
e2e-node-update-coverage-report: ${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}
278296
e2e-node-delete-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
297+
e2e-node-delete-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
279298
e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
280299
secrets:
281300
codacy-project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}

‎.github/workflows/templates/config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ tests:
2121
jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_update.*\\.test\\.mjs\"
2222
- name: Node Delete
2323
jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_delete.*\\.test\\.mjs\"
24+
- name: Node Delete - Separate commands
25+
jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/separate_node_delete.*\\.test\\.mjs\"
2426
- name: Relay
2527
jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/relay\\.test\\.mjs\"

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ on:
100100
type: string
101101
required: false
102102
default: "e2e-node-delete"
103+
e2e-node-delete-separate-commands-test-subdir:
104+
description: "E2E Node Delete - Separate commands Test Subdirectory:"
105+
type: string
106+
required: false
107+
default: "e2e-node-delete-separate-commands"
103108
e2e-relay-test-subdir:
104109
description: "E2E Relay Test Subdirectory:"
105110
type: string
@@ -150,6 +155,11 @@ on:
150155
type: string
151156
required: false
152157
default: "E2E Node Delete Tests Coverage Report"
158+
e2e-node-delete-separate-commands-coverage-report:
159+
description: "E2E Node Delete - Separate commands Coverage Report:"
160+
type: string
161+
required: false
162+
default: "E2E Node Delete - Separate commands Tests Coverage Report"
153163
e2e-relay-coverage-report:
154164
description: "E2E Relay Coverage Report:"
155165
type: string
@@ -268,19 +278,19 @@ jobs:
268278
name: ${{ inputs.e2e-node-delete-coverage-report }}
269279
path: 'coverage/${{ inputs.e2e-node-delete-test-subdir }}'
270280

271-
- name: Download E2E Relay Coverage Report
281+
- name: Download E2E Node Delete - Separate commands Coverage Report
272282
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
273283
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
274284
with:
275-
name: ${{ inputs.e2e-relay-coverage-report }}
276-
path: 'coverage/${{ inputs.e2e-relay-test-subdir }}'
285+
name: ${{ inputs.e2e-node-delete-separate-commands-coverage-report }}
286+
path: 'coverage/${{ inputs.e2e-node-delete-separate-commands-test-subdir }}'
277287

278-
- name: Download E2E Test Report
288+
- name: Download E2E Relay Coverage Report
279289
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
280290
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
281291
with:
282-
pattern: "e2e_test_report_*"
283-
path: "e2e_test_report"
292+
name: ${{ inputs.e2e-relay-coverage-report }}
293+
path: 'coverage/${{ inputs.e2e-relay-test-subdir }}'
284294

285295
- name: Publish E2E Test Report
286296
uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a # v2.17.1

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ on:
5353
e2e-node-delete-test-subdir:
5454
description: "E2E Node Delete Test Subdirectory"
5555
value: ${{ jobs.env-vars.outputs.e2e_node_delete_test_subdir }}
56+
e2e-node-delete-separate-commands-test-subdir:
57+
description: "E2E Node Delete - Separate commands Test Subdirectory"
58+
value: ${{ jobs.env-vars.outputs.e2e_node_delete_separate_commands_test_subdir }}
5659
e2e-relay-test-subdir:
5760
description: "E2E Relay Test Subdirectory"
5861
value: ${{ jobs.env-vars.outputs.e2e_relay_test_subdir }}
@@ -83,6 +86,9 @@ on:
8386
e2e-node-delete-coverage-report:
8487
description: "E2E Node Delete Tests Coverage Report"
8588
value: ${{ jobs.env-vars.outputs.e2e_node_delete_coverage_report }}
89+
e2e-node-delete-separate-commands-coverage-report:
90+
description: "E2E Node Delete - Separate commands Tests Coverage Report"
91+
value: ${{ jobs.env-vars.outputs.e2e_node_delete_separate_commands_coverage_report }}
8692
e2e-relay-coverage-report:
8793
description: "E2E Relay Tests Coverage Report"
8894
value: ${{ jobs.env-vars.outputs.e2e_relay_coverage_report }}
@@ -105,6 +111,7 @@ jobs:
105111
e2e_node_add_separate_commands_test_subdir: e2e-node-add-separate-commands
106112
e2e_node_update_test_subdir: e2e-node-update
107113
e2e_node_delete_test_subdir: e2e-node-delete
114+
e2e_node_delete_separate_commands_test_subdir: e2e-node-delete-separate-commands
108115
e2e_relay_test_subdir: e2e-relay
109116
e2e_standard_coverage_report: "E2E Standard Tests Coverage Report"
110117
e2e_mirror_node_coverage_report: "E2E Mirror Node Tests Coverage Report"
@@ -115,6 +122,7 @@ jobs:
115122
e2e_node_add_separate_commands_coverage_report: "E2E Node Add - Separate commands Tests Coverage Report"
116123
e2e_node_update_coverage_report: "E2E Node Update Tests Coverage Report"
117124
e2e_node_delete_coverage_report: "E2E Node Delete Tests Coverage Report"
125+
e2e_node_delete_separate_commands_coverage_report: "E2E Node Delete - Separate commands Tests Coverage Report"
118126
e2e_relay_coverage_report: "E2E Relay Tests Coverage Report"
119127
steps:
120128
- run: echo "Exposing environment variables to reusable workflows"

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"test-e2e-node-add-separate-commands": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Add - Separate commands Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-add-separate-commands.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-add-separate-commands' --testRegex=\".*\\/e2e\\/commands\\/separate_node_add.*\\.test\\.mjs\"",
2323
"test-e2e-node-update": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Update Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-update.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-update' --testRegex=\".*\\/e2e\\/commands\\/node_update.*\\.test\\.mjs\"",
2424
"test-e2e-node-delete": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Delete Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-delete.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-delete' --testRegex=\".*\\/e2e\\/commands\\/node_delete.*\\.test\\.mjs\"",
25+
"test-e2e-node-delete-separate-commands": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Delete - Separate commands Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-delete-separate-commands.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-delete-separate-commands' --testRegex=\".*\\/e2e\\/commands\\/separate_node_delete.*\\.test\\.mjs\"",
2526
"test-e2e-relay": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Relay Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-relay.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-relay' --testRegex=\".*\\/e2e\\/commands\\/relay\\.test\\.mjs\"",
2627
"merge-clean": "rm -rf .nyc_output && mkdir .nyc_output && rm -rf coverage/lcov-report && rm -rf coverage/solo && rm coverage/*.*",
2728
"merge-e2e": "nyc merge ./coverage/e2e/ .nyc_output/coverage.json",

0 commit comments

Comments
 (0)