Skip to content

Commit b43c401

Browse files
committed
ci: sync with Fedora source-git
1 parent ff3186b commit b43c401

File tree

2 files changed

+29
-72
lines changed

2 files changed

+29
-72
lines changed

.github/workflows/container.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ permissions:
1818
contents: read
1919

2020
jobs:
21-
push_to_registry:
21+
arm64:
2222
name: ${{ matrix.config.tag }} on ${{ matrix.config.platform }}
2323
runs-on: ubuntu-latest
2424
concurrency:
25-
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
25+
group: arm64-${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
2626
cancel-in-progress: true
2727
strategy:
2828
fail-fast: false
2929
matrix:
3030
config:
31-
- { dockerfile: 'Dockerfile-CentOS-10-Stream', tag: 'centos:stream10' }
31+
- { dockerfile: 'Dockerfile-CentOS-10-Stream', tag: 'centos:stream10', platform: 'linux/arm64,linux/amd64' }
3232
steps:
3333
- name: Set up QEMU
3434
uses: docker/setup-qemu-action@v3

.github/workflows/integration.yml

+26-69
Original file line numberDiff line numberDiff line change
@@ -33,64 +33,6 @@ jobs:
3333
uses: actions/checkout@v4
3434
- name: "${{ matrix.container }} TEST-${{ matrix.test }}"
3535
run: ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
36-
network:
37-
name: ${{ matrix.test }} on ${{ matrix.container }} using ${{ matrix.network }}
38-
runs-on: ubuntu-latest
39-
timeout-minutes: 45
40-
concurrency:
41-
group: network-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-${{ matrix.network }}
42-
cancel-in-progress: true
43-
strategy:
44-
matrix:
45-
container: [
46-
"centos:stream10",
47-
]
48-
network: [
49-
"network",
50-
]
51-
test: [
52-
"20",
53-
"40",
54-
"50",
55-
"60",
56-
]
57-
fail-fast: false
58-
container:
59-
image: ghcr.io/redhat-plumbers/${{ matrix.container }}
60-
options: "--privileged -v /dev:/dev"
61-
steps:
62-
- name: "Checkout Repository"
63-
uses: actions/checkout@v4
64-
- name: "${{ matrix.container }} TEST-${{ matrix.test }}"
65-
run: USE_NETWORK=${{ matrix.network }} ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
66-
systemd-networkd:
67-
name: ${{ matrix.test }} on ${{ matrix.container }} using ${{ matrix.network }}
68-
runs-on: ubuntu-latest
69-
timeout-minutes: 45
70-
concurrency:
71-
group: systemd-networkd-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-${{ matrix.network }}
72-
cancel-in-progress: true
73-
strategy:
74-
matrix:
75-
container: [
76-
"arch",
77-
]
78-
network: [
79-
"systemd-networkd",
80-
]
81-
test: [
82-
"35",
83-
"40",
84-
]
85-
fail-fast: false
86-
container:
87-
image: ghcr.io/redhat-plumbers/${{ matrix.container }}
88-
options: "--privileged -v /dev:/dev"
89-
steps:
90-
- name: "Checkout Repository"
91-
uses: actions/checkout@v4
92-
- name: "${{ matrix.container }} TEST-${{ matrix.test }}"
93-
run: USE_NETWORK=${{ matrix.network }} ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
9436
extended:
9537
name: ${{ matrix.test }} on ${{ matrix.container }}
9638
runs-on: ubuntu-latest
@@ -134,8 +76,6 @@ jobs:
13476
timeout-minutes: 45
13577
concurrency:
13678
group: dracut-cpio-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}
137-
138-
13979
cancel-in-progress: true
14080
strategy:
14181
fail-fast: false
@@ -144,24 +84,41 @@ jobs:
14484
"centos:stream10",
14585
]
14686
test: [
147-
"20",
148-
"30",
149-
"35",
150-
"40",
151-
"50",
152-
"60",
87+
"63",
15388
]
15489
container:
15590
image: ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}
15691
options: "--privileged -v /dev:/dev"
15792
steps:
15893
- name: "Checkout Repository"
15994
uses: actions/checkout@v4
95+
- name: "${{ matrix.container }} TEST-${{ matrix.test }}"
96+
run: ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
97+
arm64:
98+
name: ${{ matrix.test }} on ${{ matrix.container }} on arm64
99+
runs-on: ubuntu-latest
100+
timeout-minutes: 45
101+
concurrency:
102+
group: arm64-${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}
103+
cancel-in-progress: true
104+
strategy:
105+
fail-fast: false
106+
matrix:
107+
container: [
108+
"centos:stream10",
109+
]
110+
test: [
111+
"98",
112+
]
113+
steps:
114+
- name: Set up QEMU
115+
uses: docker/setup-qemu-action@v3
160116
with:
161-
fetch-depth: 0
162-
117+
platforms: 'linux/arm64'
118+
- name: "Checkout Repository"
119+
uses: actions/checkout@v4
163120
- name: "${{ matrix.container }} TEST-${{ matrix.test }}"
164-
run: USE_NETWORK=${{ matrix.network }} ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
121+
run: docker run --platform linux/arm64 --privileged -v /dev:/dev -v $PWD:/w ghcr.io/${{ github.repository_owner }}/${{ matrix.container }} /w/tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
165122
network:
166123
# all nfs based on default networking
167124
name: ${{ matrix.test }} on ${{ matrix.container }}

0 commit comments

Comments
 (0)