File tree Expand file tree Collapse file tree 1 file changed +27
-11
lines changed Expand file tree Collapse file tree 1 file changed +27
-11
lines changed Original file line number Diff line number Diff line change @@ -100,10 +100,10 @@ jobs:
100
100
run : tools/make-man-page.sh
101
101
102
102
integration-test :
103
- runs-on : ubuntu-24.04
103
+ runs-on : ${{ matrix.runner }}
104
104
needs : unit-test
105
105
concurrency :
106
- group : ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.tools }}-${{ github.ref }}
106
+ group : ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.tools }}-${{ matrix.runner }}-${{ github.ref }}
107
107
cancel-in-progress : true
108
108
strategy :
109
109
fail-fast : false
@@ -122,6 +122,8 @@ jobs:
122
122
- fedora
123
123
- opensuse
124
124
- ubuntu
125
+ runner :
126
+ - ubuntu-24.04
125
127
exclude :
126
128
# pacman is not packaged in EPEL.
127
129
- distro : arch
@@ -139,6 +141,17 @@ jobs:
139
141
tools : opensuse
140
142
- distro : ubuntu
141
143
tools : opensuse
144
+ include :
145
+ # low rate limit on s390x/ppc64le/arm64 workers, just run two jobs
146
+ - distro : debian
147
+ tools : debian
148
+ runner : ubuntu-24.04-s390x
149
+ - distro : fedora
150
+ tools : fedora
151
+ runner : ubuntu-24.04-ppc64le
152
+ - distro : debian
153
+ tools : debian
154
+ runner : ubuntu-24.04-arm
142
155
143
156
steps :
144
157
- uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -216,12 +229,15 @@ jobs:
216
229
217
230
- name : Run integration tests
218
231
run : |
219
- sudo mkosi box -- \
220
- timeout -k 30 1h \
221
- python3 -m pytest \
222
- --tb=no \
223
- --capture=no \
224
- --verbose \
225
- -m integration \
226
- --distribution ${{ matrix.distro }} \
227
- tests/
232
+ # Without KVM the tests are way too slow and time out
233
+ if [[ -e /dev/kvm ]]; then
234
+ sudo mkosi box -- \
235
+ timeout -k 30 1h \
236
+ python3 -m pytest \
237
+ --tb=no \
238
+ --capture=no \
239
+ --verbose \
240
+ -m integration \
241
+ --distribution ${{ matrix.distro }} \
242
+ tests/
243
+ fi
You can’t perform that action at this time.
0 commit comments