Skip to content

Commit 425ef64

Browse files
daipomdaipom
committed
ci: add AlmaLinux 10 for RPM tests
Signed-off-by: Daijiro Fukuda <[email protected]>
1 parent 0ca4876 commit 425ef64

File tree

2 files changed

+55
-43
lines changed

2 files changed

+55
-43
lines changed

‎.github/workflows/yum.matrix.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,28 @@
44
"label": "RockyLinux 8 x86_64",
55
"rake-job": "rockylinux-8",
66
"test-docker-image": "rockylinux:8",
7+
"test-incus-image": "images:rockylinux/8",
78
"centos-stream": false
89
},
910
{
1011
"label": "AlmaLinux 9 x86_64",
1112
"rake-job": "almalinux-9",
1213
"test-docker-image": "almalinux:9",
14+
"test-incus-image": "images:almalinux/9",
1315
"centos-stream": false
1416
},
1517
{
1618
"label": "AlmaLinux 10 x86_64",
1719
"rake-job": "almalinux-10",
1820
"test-docker-image": "almalinux:10",
21+
"test-incus-image": "images:almalinux/10",
1922
"centos-stream": false
2023
},
2124
{
2225
"label": "Amazon Linux 2023 x86_64",
2326
"rake-job": "amazonlinux-2023",
2427
"test-docker-image": "amazonlinux:2023",
28+
"test-incus-image": "images:amazonlinux/2023",
2529
"centos-stream": false
2630
}
2731
]

‎.github/workflows/yum.yml‎

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ jobs:
1313
runs-on: ubuntu-latest
1414
outputs:
1515
matrix: ${{ steps.set-matrix.outputs.matrix }}
16+
label: ${{ steps.set-matrix.outputs.label }}
1617
steps:
1718
- uses: actions/checkout@v4
1819
- id: set-matrix
1920
# See https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/evaluate-expressions-in-workflows-and-actions#example-returning-a-json-object
20-
run: echo "matrix=$(cat yum.matrix.json | jq --compact-output)" >> $GITHUB_OUTPUT
21+
run: |
22+
echo "matrix=$(cat yum.matrix.json | jq --compact-output)" >> $GITHUB_OUTPUT
23+
echo "label=$(cat yum.matrix.json | jq '[.include[].label]' --compact-output)" >> $GITHUB_OUTPUT
2124
working-directory: .github/workflows/
2225
build:
2326
needs: define-matrix
@@ -273,16 +276,13 @@ jobs:
273276

274277
v2test:
275278
name: Test ${{ matrix.label }} ${{ matrix.test }} (CGroup V2)
276-
needs: [check_package_size, installation_test, serverspec_test, confluent_test, binstubs_test]
279+
needs: [define-matrix, check_package_size, installation_test, serverspec_test, confluent_test, binstubs_test]
277280
runs-on: ubuntu-latest
278281
timeout-minutes: 15
279282
strategy:
280283
fail-fast: false
281284
matrix:
282-
label:
283-
- RockyLinux 8 x86_64
284-
- AlmaLinux 9 x86_64
285-
- AmazonLinux 2023 x86_64
285+
label: ${{ fromJSON(needs.define-matrix.outputs.label) }}
286286
test:
287287
- "update-from-v4.sh"
288288
- "update-from-v4.sh via-v5"
@@ -309,25 +309,46 @@ jobs:
309309
- "update-without-data-lost.sh v6 v7"
310310
- "update-without-data-lost.sh v7 v6"
311311
- "obsolete-plugins.sh"
312-
include:
313-
- label: RockyLinux 8 x86_64
314-
rake-job: rockylinux-8
315-
container-image: images:rockylinux/8
316-
- label: AlmaLinux 9 x86_64
317-
rake-job: almalinux-9
318-
container-image: images:almalinux/9
319-
- label: AmazonLinux 2023 x86_64
320-
rake-job: amazonlinux-2023
321-
container-image: images:amazonlinux/2023
312+
include: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
322313
exclude:
323-
- label: AmazonLinux 2023 x86_64
314+
- label: Amazon Linux 2023 x86_64
315+
test: update-from-v4.sh
316+
- label: Amazon Linux 2023 x86_64
317+
test: update-from-v4.sh via-v5
318+
- label: Amazon Linux 2023 x86_64
319+
test: update-to-next-version-with-backward-compat-for-v4.sh
320+
- label: Amazon Linux 2023 x86_64
321+
test: downgrade-to-v4.sh
322+
- label: AlmaLinux 10 x86_64
324323
test: update-from-v4.sh
325-
- label: AmazonLinux 2023 x86_64
324+
- label: AlmaLinux 10 x86_64
326325
test: update-from-v4.sh via-v5
327-
- label: AmazonLinux 2023 x86_64
326+
- label: AlmaLinux 10 x86_64
327+
test: update-from-v5-lts.sh
328+
- label: AlmaLinux 10 x86_64
328329
test: update-to-next-version-with-backward-compat-for-v4.sh
329-
- label: AmazonLinux 2023 x86_64
330+
- label: AlmaLinux 10 x86_64
330331
test: downgrade-to-v4.sh
332+
- label: AlmaLinux 10 x86_64
333+
test: downgrade-to-v5-lts.sh
334+
- label: AlmaLinux 10 x86_64
335+
test: install-newly.sh v5
336+
# After replacing to v6 lts test, this condition should be removed
337+
- label: AlmaLinux 10 x86_64
338+
test: install-newly.sh lts
339+
# rpmrebuild is not supported on EPEL for AlmaLinux 10 yet
340+
- label: AlmaLinux 10 x86_64
341+
test: update-to-next-version.sh
342+
- label: AlmaLinux 10 x86_64
343+
test: update-to-next-version-service-status.sh enabled active
344+
- label: AlmaLinux 10 x86_64
345+
test: update-to-next-version-service-status.sh enabled inactive
346+
- label: AlmaLinux 10 x86_64
347+
test: update-to-next-version-service-status.sh disabled active
348+
- label: AlmaLinux 10 x86_64
349+
test: update-to-next-version-service-status.sh disabled inactive
350+
- label: AlmaLinux 10 x86_64
351+
test: update-to-next-version-with-auto-and-manual.sh
331352
steps:
332353
- uses: actions/checkout@v4
333354
- uses: actions/download-artifact@v4
@@ -352,37 +373,24 @@ jobs:
352373
- name: Setup Incus
353374
run: |
354375
sudo incus admin init --auto
355-
- name: Run Test ${{ matrix.test }} on ${{ matrix.container-image }}
356-
run: fluent-package/yum/systemd-test/test.sh ${{ matrix.container-image }} ${{ matrix.test }}
376+
- name: Run Test ${{ matrix.test }} on ${{ matrix.test-incus-image }}
377+
run: fluent-package/yum/systemd-test/test.sh ${{ matrix.test-incus-image }} ${{ matrix.test }}
357378

358379
fluent-release-test:
359380
name: Test ${{ matrix.label }} ${{ matrix.test }} (CGroup V2)
360-
needs: [v2test]
381+
needs: [define-matrix, v2test]
361382
runs-on: ubuntu-latest
362383
timeout-minutes: 15
363384
strategy:
364385
fail-fast: false
365386
matrix:
366-
label:
367-
- RockyLinux 8 x86_64
368-
- AlmaLinux 9 x86_64
369-
# - AlmaLinux 10 x86_64
370-
- AmazonLinux 2023 x86_64
387+
label: ${{ fromJSON(needs.define-matrix.outputs.label) }}
371388
test:
372389
- install-from-r2.sh
373-
include:
374-
- label: RockyLinux 8 x86_64
375-
rake-job: rockylinux-8
376-
container-image: images:rockylinux/8
377-
- label: AlmaLinux 9 x86_64
378-
rake-job: almalinux-9
379-
container-image: images:almalinux/9
380-
# - label: AlmaLinux 10 x86_64
381-
# rake-job: almalinux-10
382-
# container-image: images:almalinux/10
383-
- label: AmazonLinux 2023 x86_64
384-
rake-job: amazonlinux-2023
385-
container-image: images:amazonlinux/2023
390+
include: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
391+
exclude:
392+
# There are no released for AlmaLinux 10 x86_64 yet
393+
- label: AlmaLinux 10 x86_64
386394
steps:
387395
- uses: actions/checkout@v4
388396
- uses: actions/download-artifact@v4
@@ -400,5 +408,5 @@ jobs:
400408
- name: Setup Incus
401409
run: |
402410
sudo incus admin init --auto
403-
- name: Run Test ${{matrix.test}} on ${{ matrix.container-image }}
404-
run: fluent-release/yum/systemd-test/test.sh ${{ matrix.container-image }} ${{ matrix.test }}
411+
- name: Run Test ${{matrix.test}} on ${{ matrix.test-incus-image }}
412+
run: fluent-release/yum/systemd-test/test.sh ${{ matrix.test-incus-image }} ${{ matrix.test }}

0 commit comments

Comments
 (0)