Skip to content

Commit dbd73b1

Browse files
liangxin1300liangxin1300
authored
[crmsh-4.5] Dev: workflows: Update CI image on github action (#1785)
backport #1748 #1788
2 parents 2c89797 + 4f60a82 commit dbd73b1

File tree

3 files changed

+36
-37
lines changed

3 files changed

+36
-37
lines changed

‎.github/workflows/crmsh-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
delivery:
2424
if: github.repository == 'ClusterLabs/crmsh' && github.ref_name == 'crmsh-4.6'
2525
needs: integration
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes: 10
2828
steps:
2929
- uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
4242
submit:
4343
if: github.repository == 'ClusterLabs/crmsh' && github.ref_name == 'crmsh-4.6'
4444
needs: delivery
45-
runs-on: ubuntu-20.04
45+
runs-on: ubuntu-24.04
4646
timeout-minutes: 10
4747
steps:
4848
- uses: actions/checkout@v4

‎.github/workflows/crmsh-ci.yml

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414

1515
jobs:
1616
general_check:
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: check data-manifest
@@ -29,32 +29,29 @@ jobs:
2929
}
3030
3131
unit_test:
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-24.04
3333
strategy:
3434
matrix:
3535
python-version: ['3.6', '3.8', '3.10']
3636
fail-fast: false
3737
timeout-minutes: 5
3838
steps:
3939
- uses: actions/checkout@v4
40-
- name: Set up Python
41-
uses: actions/setup-python@v4
42-
with:
43-
python-version: ${{ matrix.python-version }}
44-
- name: Install dependencies
45-
run: |
46-
python -m pip install --upgrade pip
47-
pip install tox
48-
- name: Test with pytest in tox
40+
- name: Run unit tests in Python container
4941
run: |
42+
docker run --rm -v ${{ github.workspace }}:/app -w /app python:${{ matrix.python-version }} bash -c "
43+
python -m pip install --upgrade pip &&
44+
pip install tox &&
5045
tox -v -e${{ matrix.python-version }}
46+
"
47+
5148
- uses: codecov/codecov-action@v4
5249
with:
5350
token: ${{ secrets.CODECOV_TOKEN }}
5451
flags: unit
5552

5653
functional_test_crm_report_bugs:
57-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-24.04
5855
timeout-minutes: 40
5956
steps:
6057
- uses: actions/checkout@v4
@@ -70,7 +67,7 @@ jobs:
7067
flags: integration
7168

7269
functional_test_bootstrap_bugs:
73-
runs-on: ubuntu-20.04
70+
runs-on: ubuntu-24.04
7471
timeout-minutes: 40
7572
steps:
7673
- uses: actions/checkout@v4
@@ -86,7 +83,7 @@ jobs:
8683
flags: integration
8784

8885
functional_test_bootstrap_bugs_non_root:
89-
runs-on: ubuntu-20.04
86+
runs-on: ubuntu-24.04
9087
timeout-minutes: 40
9188
steps:
9289
- uses: actions/checkout@v4
@@ -102,7 +99,7 @@ jobs:
10299
flags: integration
103100

104101
functional_test_bootstrap_common:
105-
runs-on: ubuntu-20.04
102+
runs-on: ubuntu-24.04
106103
timeout-minutes: 40
107104
steps:
108105
- uses: actions/checkout@v4
@@ -118,7 +115,7 @@ jobs:
118115
flags: integration
119116

120117
functional_test_bootstrap_common_non_root:
121-
runs-on: ubuntu-20.04
118+
runs-on: ubuntu-24.04
122119
timeout-minutes: 40
123120
steps:
124121
- uses: actions/checkout@v4
@@ -134,7 +131,7 @@ jobs:
134131
flags: integration
135132

136133
functional_test_bootstrap_options:
137-
runs-on: ubuntu-20.04
134+
runs-on: ubuntu-24.04
138135
timeout-minutes: 40
139136
steps:
140137
- uses: actions/checkout@v4
@@ -150,7 +147,7 @@ jobs:
150147
flags: integration
151148

152149
functional_test_bootstrap_options_non_root:
153-
runs-on: ubuntu-20.04
150+
runs-on: ubuntu-24.04
154151
timeout-minutes: 40
155152
steps:
156153
- uses: actions/checkout@v4
@@ -166,7 +163,7 @@ jobs:
166163
flags: integration
167164

168165
functional_test_qdevice_setup_remove:
169-
runs-on: ubuntu-20.04
166+
runs-on: ubuntu-24.04
170167
timeout-minutes: 40
171168
steps:
172169
- uses: actions/checkout@v4
@@ -182,7 +179,7 @@ jobs:
182179
flags: integration
183180

184181
functional_test_qdevice_setup_remove_non_root:
185-
runs-on: ubuntu-20.04
182+
runs-on: ubuntu-24.04
186183
timeout-minutes: 40
187184
steps:
188185
- uses: actions/checkout@v4
@@ -198,7 +195,7 @@ jobs:
198195
flags: integration
199196

200197
functional_test_qdevice_options:
201-
runs-on: ubuntu-20.04
198+
runs-on: ubuntu-24.04
202199
timeout-minutes: 40
203200
steps:
204201
- uses: actions/checkout@v4
@@ -214,7 +211,7 @@ jobs:
214211
flags: integration
215212

216213
functional_test_qdevice_validate:
217-
runs-on: ubuntu-20.04
214+
runs-on: ubuntu-24.04
218215
timeout-minutes: 40
219216
steps:
220217
- uses: actions/checkout@v4
@@ -230,7 +227,7 @@ jobs:
230227
flags: integration
231228

232229
functional_test_qdevice_validate_non_root:
233-
runs-on: ubuntu-20.04
230+
runs-on: ubuntu-24.04
234231
timeout-minutes: 40
235232
steps:
236233
- uses: actions/checkout@v4
@@ -246,7 +243,7 @@ jobs:
246243
flags: integration
247244

248245
functional_test_qdevice_user_case:
249-
runs-on: ubuntu-20.04
246+
runs-on: ubuntu-24.04
250247
timeout-minutes: 40
251248
steps:
252249
- uses: actions/checkout@v4
@@ -262,7 +259,7 @@ jobs:
262259
flags: integration
263260

264261
functional_test_resource_failcount:
265-
runs-on: ubuntu-20.04
262+
runs-on: ubuntu-24.04
266263
timeout-minutes: 40
267264
steps:
268265
- uses: actions/checkout@v4
@@ -278,7 +275,7 @@ jobs:
278275
flags: integration
279276

280277
functional_test_resource_set:
281-
runs-on: ubuntu-20.04
278+
runs-on: ubuntu-24.04
282279
timeout-minutes: 40
283280
steps:
284281
- uses: actions/checkout@v4
@@ -294,7 +291,7 @@ jobs:
294291
flags: integration
295292

296293
functional_test_resource_set_non_root:
297-
runs-on: ubuntu-20.04
294+
runs-on: ubuntu-24.04
298295
timeout-minutes: 40
299296
steps:
300297
- uses: actions/checkout@v4
@@ -310,7 +307,7 @@ jobs:
310307
flags: integration
311308

312309
functional_test_configure_sublevel:
313-
runs-on: ubuntu-20.04
310+
runs-on: ubuntu-24.04
314311
timeout-minutes: 40
315312
steps:
316313
- uses: actions/checkout@v4
@@ -326,7 +323,7 @@ jobs:
326323
flags: integration
327324

328325
functional_test_constraints_bugs:
329-
runs-on: ubuntu-20.04
326+
runs-on: ubuntu-24.04
330327
timeout-minutes: 40
331328
steps:
332329
- uses: actions/checkout@v4
@@ -342,7 +339,7 @@ jobs:
342339
flags: integration
343340

344341
functional_test_geo_cluster:
345-
runs-on: ubuntu-20.04
342+
runs-on: ubuntu-24.04
346343
timeout-minutes: 40
347344
steps:
348345
- uses: actions/checkout@v4
@@ -358,7 +355,7 @@ jobs:
358355
flags: integration
359356

360357
functional_test_healthcheck:
361-
runs-on: ubuntu-20.04
358+
runs-on: ubuntu-24.04
362359
timeout-minutes: 40
363360
steps:
364361
- uses: actions/checkout@v4
@@ -374,7 +371,7 @@ jobs:
374371
flags: integration
375372

376373
functional_test_cluster_api:
377-
runs-on: ubuntu-20.04
374+
runs-on: ubuntu-24.04
378375
timeout-minutes: 40
379376
steps:
380377
- uses: actions/checkout@v4
@@ -389,7 +386,7 @@ jobs:
389386
flags: integration
390387

391388
functional_test_user_access:
392-
runs-on: ubuntu-20.04
389+
runs-on: ubuntu-24.04
393390
timeout-minutes: 40
394391
steps:
395392
- uses: actions/checkout@v4
@@ -404,7 +401,7 @@ jobs:
404401
flags: integration
405402

406403
functional_test_blocking_ssh:
407-
runs-on: ubuntu-20.04
404+
runs-on: ubuntu-24.04
408405
timeout-minutes: 40
409406
steps:
410407
- uses: actions/checkout@v4
@@ -419,7 +416,7 @@ jobs:
419416
flags: integration
420417

421418
original_regression_test:
422-
runs-on: ubuntu-20.04
419+
runs-on: ubuntu-24.04
423420
timeout-minutes: 40
424421
steps:
425422
- uses: actions/checkout@v4

‎test/features/bootstrap_bugs.feature

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ Feature: Regression test for bootstrap bugs
4141
Given Cluster service is "stopped" on "hanode2"
4242
When Run "crm cluster init -u -i eth0 -y" on "hanode1"
4343
Then Cluster service is "started" on "hanode1"
44+
When Run "iptables -A INPUT -i eth1 -s @hanode1.ip.default -j DROP" on "hanode2"
4445
When Try "crm cluster join -c hanode1 -i eth1 -y" on "hanode2"
4546
Then Cluster service is "stopped" on "hanode2"
4647
And Except "Cannot see peer node "hanode1", please check the communication IP" in stderr
4748
When Run "crm cluster join -c hanode1 -i eth0 -y" on "hanode2"
4849
Then Cluster service is "started" on "hanode2"
50+
When Run "iptables -D INPUT -i eth1 -s @hanode1.ip.default -j DROP" on "hanode2"
4951

5052
@clean
5153
Scenario: Remove correspond nodelist in corosync.conf while remove(bsc#1165644)

0 commit comments

Comments
 (0)