Skip to content

Commit ff625f6

Browse files
RaunakJalanRaunakJalan
authored
Adding upgrade yaml, fixing upgrade case and adding device remove stress case (#911)
* Adding e2e yaml and data nic param * Test: Fixing snapshot deleting uuid column * Testing: Fixing e2e tests * Testing: Fixing e2e yaml summary and adding e2e only * Testing: Fixing e2e yaml summary and adding e2e only * Testing: Fixing e2e yaml summary and adding e2e only * Adding test fixes * Adding test fixes * Adding a scheduler * Fixing deletes for lvol based on count * Fixing deletes for lvol based on count * Fixing notification and parallel lvol deletes * Parallel lvol delete clone delete * Parallel lvol delete clone delete * Adding upgrade yaml, fixing upgrade case and adding device remove stress case * Adding upgrade yaml, fixing upgrade case and adding device remove stress case * Adding upgrade yaml, fixing upgrade case and adding device remove stress case
1 parent 47bd5e1 commit ff625f6

13 files changed

+3200
-59
lines changed

‎.github/workflows/e2e-bootstrap.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
name: Bootstrap Cluster + Run E2E Tests
2+
run-name: "E2E Bootstrap | ${{ github.ref_name }} | ${{ inputs.MNODES }}"
23

34
on:
45
workflow_call:
56
inputs:
67
STORAGE_PRIVATE_IPS:
78
type: string
89
default: "192.168.10.205 192.168.10.206 192.168.10.207 192.168.10.208"
9-
SEC_STORAGE_PRIVATE_IPS:
10-
type: string
11-
default: ""
1210
API_INVOKE_URL:
1311
type: string
1412
default: "http://192.168.10.211/"
@@ -75,6 +73,10 @@ on:
7573
TEST_CLASS:
7674
type: string
7775
default: ""
76+
RUN_LABEL:
77+
type: string
78+
default: ""
79+
description: "Optional label appended to artifact names to avoid collisions when called multiple times in the same workflow run (e.g. 'run1', 'run2')"
7880
workflow_dispatch:
7981
inputs:
8082
# =========================
@@ -84,10 +86,6 @@ on:
8486
description: "Space-separated storage node IPs (also used for cleanup)"
8587
required: true
8688
default: "192.168.10.205 192.168.10.206 192.168.10.207 192.168.10.208"
87-
SEC_STORAGE_PRIVATE_IPS:
88-
description: "Secondary storage IPs (optional)"
89-
required: false
90-
default: ""
9189

9290
API_INVOKE_URL:
9391
description: "API invoke URL"
@@ -215,7 +213,6 @@ jobs:
215213
env:
216214
# Cluster/lab env
217215
STORAGE_PRIVATE_IPS: ${{ inputs.STORAGE_PRIVATE_IPS || '192.168.10.205 192.168.10.206 192.168.10.207 192.168.10.208' }}
218-
SEC_STORAGE_PRIVATE_IPS: ${{ inputs.SEC_STORAGE_PRIVATE_IPS || '' }}
219216
API_INVOKE_URL: ${{ inputs.API_INVOKE_URL || 'http://192.168.10.211/' }}
220217
API_BASE_URL: ${{ inputs.API_INVOKE_URL || 'http://192.168.10.211/' }}
221218
BASTION_IP: ${{ inputs.BASTION_IP || '192.168.10.211' }}
@@ -1244,7 +1241,7 @@ jobs:
12441241
if: always()
12451242
uses: actions/upload-artifact@v4
12461243
with:
1247-
name: simplyblock-e2e-logs-${{ github.run_id }}
1244+
name: simplyblock-e2e-logs-${{ github.run_id }}${{ inputs.RUN_LABEL != '' && format('-{0}', inputs.RUN_LABEL) || '' }}
12481245
path: |
12491246
simplyBlockDeploy/bare-metal/bootstrap.log
12501247
sbcli/e2e/output.log
@@ -1261,7 +1258,7 @@ jobs:
12611258
if: always() && env.RUN_BASE_DIR != '' && env.MGMT_IP != ''
12621259
uses: actions/upload-artifact@v4
12631260
with:
1264-
name: simplyblock-e2e-small-logs-${{ github.run_id }}
1261+
name: simplyblock-e2e-small-logs-${{ github.run_id }}${{ inputs.RUN_LABEL != '' && format('-{0}', inputs.RUN_LABEL) || '' }}
12651262
path: |
12661263
sbcli/e2e/output.log
12671264
${{ env.RUN_BASE_DIR }}/${{ env.MGMT_IP }}/mgmt_details/mgmt/*.txt

‎.github/workflows/e2e-only.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Run E2E Tests on Existing Cluster
2+
run-name: "E2E | ${{ github.ref_name }} | ${{ inputs.MNODES }}"
23

34
on:
45
workflow_dispatch:
@@ -11,11 +12,6 @@ on:
1112
required: true
1213
default: "192.168.10.205 192.168.10.206 192.168.10.207 192.168.10.208"
1314

14-
SEC_STORAGE_PRIVATE_IPS:
15-
description: "Secondary storage IPs (optional)"
16-
required: false
17-
default: ""
18-
1915
API_INVOKE_URL:
2016
description: "API invoke URL"
2117
required: true
@@ -104,7 +100,6 @@ jobs:
104100
env:
105101
# Cluster/lab env
106102
STORAGE_PRIVATE_IPS: ${{ inputs.STORAGE_PRIVATE_IPS }}
107-
SEC_STORAGE_PRIVATE_IPS: ${{ inputs.SEC_STORAGE_PRIVATE_IPS }}
108103
API_INVOKE_URL: ${{ inputs.API_INVOKE_URL }}
109104
API_BASE_URL: ${{ inputs.API_INVOKE_URL }}
110105
BASTION_IP: ${{ inputs.BASTION_IP }}

‎.github/workflows/e2e-scheduler.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
BOOTSTRAP_PARITY_CHUNKS: "1"
6464
BOOTSTRAP_HA_JM_COUNT: "4"
6565
BOOTSTRAP_JOURNAL_PARTITION: "1"
66+
RUN_LABEL: "run1"
6667

6768
# ============================================================
6869
# RUN 2 — R25.10-Hotfix | ndcs=2 npcs=2 | 4 storage nodes
@@ -84,6 +85,7 @@ jobs:
8485
BOOTSTRAP_PARITY_CHUNKS: "2"
8586
BOOTSTRAP_HA_JM_COUNT: "4"
8687
BOOTSTRAP_JOURNAL_PARTITION: "1"
88+
RUN_LABEL: "run2"
8789

8890
# ============================================================
8991
# RUN 3 — main | ndcs=1 npcs=1 | 3 storage nodes
@@ -105,6 +107,7 @@ jobs:
105107
BOOTSTRAP_PARITY_CHUNKS: "1"
106108
BOOTSTRAP_HA_JM_COUNT: "4"
107109
BOOTSTRAP_JOURNAL_PARTITION: "1"
110+
RUN_LABEL: "run3"
108111

109112
# ============================================================
110113
# RUN 4 — main | ndcs=2 npcs=2 | 4 storage nodes
@@ -126,3 +129,4 @@ jobs:
126129
BOOTSTRAP_PARITY_CHUNKS: "2"
127130
BOOTSTRAP_HA_JM_COUNT: "4"
128131
BOOTSTRAP_JOURNAL_PARTITION: "1"
132+
RUN_LABEL: "run4"

‎.github/workflows/stress-run-bootstrap.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Bootstrap Cluster + Stress Run Until Failure
2+
run-name: "Stress Bootstrap | ${{ github.ref_name }} | ${{ inputs.MNODES }}"
23

34
on:
45
workflow_dispatch:
@@ -10,11 +11,6 @@ on:
1011
description: "Space-separated storage node IPs (also used for cleanup)"
1112
required: true
1213
default: "192.168.10.205 192.168.10.206 192.168.10.207 192.168.10.208"
13-
SEC_STORAGE_PRIVATE_IPS:
14-
description: "Secondary storage IPs (optional)"
15-
required: false
16-
default: ""
17-
1814
API_INVOKE_URL:
1915
description: "API invoke URL"
2016
required: true
@@ -141,7 +137,6 @@ jobs:
141137
env:
142138
# Cluster/lab env
143139
STORAGE_PRIVATE_IPS: ${{ inputs.STORAGE_PRIVATE_IPS }}
144-
SEC_STORAGE_PRIVATE_IPS: ${{ inputs.SEC_STORAGE_PRIVATE_IPS }}
145140
API_INVOKE_URL: ${{ inputs.API_INVOKE_URL }}
146141
API_BASE_URL: ${{ inputs.API_INVOKE_URL }}
147142
BASTION_IP: ${{ inputs.BASTION_IP }}

‎.github/workflows/stress-run-only.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Stress Run on existing cluster Until Failure
2+
run-name: "Stress | ${{ github.ref_name }} | ${{ inputs.MNODES }}"
23

34
on:
45
workflow_dispatch:
@@ -11,11 +12,6 @@ on:
1112
required: true
1213
default: "192.168.10.205 192.168.10.206 192.168.10.207 192.168.10.208"
1314

14-
SEC_STORAGE_PRIVATE_IPS:
15-
description: "Secondary storage IPs (optional)"
16-
required: false
17-
default: ""
18-
1915
API_INVOKE_URL:
2016
description: "API invoke URL"
2117
required: true
@@ -99,7 +95,6 @@ jobs:
9995
env:
10096
# Cluster/lab env
10197
STORAGE_PRIVATE_IPS: ${{ inputs.STORAGE_PRIVATE_IPS }}
102-
SEC_STORAGE_PRIVATE_IPS: ${{ inputs.SEC_STORAGE_PRIVATE_IPS }}
10398
API_INVOKE_URL: ${{ inputs.API_INVOKE_URL }}
10499
API_BASE_URL: ${{ inputs.API_INVOKE_URL }}
105100
BASTION_IP: ${{ inputs.BASTION_IP }}

0 commit comments

Comments
 (0)