Skip to content

Commit 1233376

Browse files
authored
Merge pull request #301 from dafyddj/style/instance-ordering
style(gitlab-ci): order instances alphabetically for consistency
2 parents 60ccdab + 06cfa97 commit 1233376

1 file changed

Lines changed: 30 additions & 29 deletions

File tree

.gitlab-ci.yml

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -182,62 +182,63 @@ test-formula-conversion: {extends: '.test_conversion'}
182182
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
183183
# https://github.com/saltstack/great-module-migration/issues/14
184184
#
185+
almalinux-9-master: {extends: '.test_instance'}
186+
almalinux-8-master: {extends: '.test_instance'}
187+
amazonlinux-2023-master: {extends: '.test_instance'}
188+
amazonlinux-2-master: {extends: '.test_instance_failure_permitted'}
189+
centos-stream9-master: {extends: '.test_instance'}
185190
debian-12-master: {extends: '.test_instance'}
186191
debian-11-master: {extends: '.test_instance'}
187-
ubuntu-2404-master: {extends: '.test_instance'}
188-
ubuntu-2204-master: {extends: '.test_instance'}
189-
ubuntu-2004-master: {extends: '.test_instance'}
190-
centos-stream9-master: {extends: '.test_instance'}
192+
fedora-41-master: {extends: '.test_instance_failure_permitted'}
193+
fedora-40-master: {extends: '.test_instance'}
191194
opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
192195
opensuse-leap-155-master: {extends: '.test_instance'}
193196
opensuse-tmbl-latest-master: {extends: '.test_instance'}
194-
amazonlinux-2023-master: {extends: '.test_instance'}
195-
fedora-41-master: {extends: '.test_instance_failure_permitted'}
196-
fedora-40-master: {extends: '.test_instance'}
197197
oraclelinux-9-master: {extends: '.test_instance'}
198198
oraclelinux-8-master: {extends: '.test_instance'}
199-
almalinux-9-master: {extends: '.test_instance'}
200-
almalinux-8-master: {extends: '.test_instance'}
201199
rockylinux-9-master: {extends: '.test_instance'}
202200
rockylinux-8-master: {extends: '.test_instance'}
201+
ubuntu-2404-master: {extends: '.test_instance'}
202+
ubuntu-2204-master: {extends: '.test_instance'}
203+
ubuntu-2004-master: {extends: '.test_instance'}
204+
almalinux-9-3007-2: {extends: '.test_instance'}
205+
almalinux-8-3007-2: {extends: '.test_instance'}
206+
amazonlinux-2023-3007-2: {extends: '.test_instance'}
207+
amazonlinux-2-3007-2: {extends: '.test_instance_failure_permitted'}
208+
centos-stream9-3007-2: {extends: '.test_instance'}
203209
debian-12-3007-2: {extends: '.test_instance'}
204210
debian-11-3007-2: {extends: '.test_instance'}
205-
ubuntu-2404-3007-2: {extends: '.test_instance'}
206-
ubuntu-2204-3007-2: {extends: '.test_instance'}
207-
ubuntu-2004-3007-2: {extends: '.test_instance'}
208-
centos-stream9-3007-2: {extends: '.test_instance'}
211+
fedora-41-3007-2: {extends: '.test_instance_failure_permitted'}
212+
fedora-40-3007-2: {extends: '.test_instance'}
209213
opensuse-leap-156-3007-2: {extends: '.test_instance'}
210214
opensuse-leap-155-3007-2: {extends: '.test_instance'}
211215
opensuse-tmbl-latest-3007-2: {extends: '.test_instance'}
212-
fedora-41-3007-2: {extends: '.test_instance_failure_permitted'}
213-
fedora-40-3007-2: {extends: '.test_instance'}
214-
amazonlinux-2-3007-2: {extends: '.test_instance_failure_permitted'}
215-
amazonlinux-2023-3007-2: {extends: '.test_instance'}
216216
oraclelinux-9-3007-2: {extends: '.test_instance'}
217217
oraclelinux-8-3007-2: {extends: '.test_instance'}
218-
almalinux-9-3007-2: {extends: '.test_instance'}
219-
almalinux-8-3007-2: {extends: '.test_instance'}
220218
rockylinux-9-3007-2: {extends: '.test_instance'}
221219
rockylinux-8-3007-2: {extends: '.test_instance'}
220+
ubuntu-2404-3007-2: {extends: '.test_instance'}
221+
ubuntu-2204-3007-2: {extends: '.test_instance'}
222+
ubuntu-2004-3007-2: {extends: '.test_instance'}
223+
almalinux-9-3006-10: {extends: '.test_instance'}
224+
almalinux-8-3006-10: {extends: '.test_instance'}
225+
amazonlinux-2023-3006-10: {extends: '.test_instance'}
226+
amazonlinux-2-3006-10: {extends: '.test_instance_failure_permitted'}
227+
centos-stream9-3006-10: {extends: '.test_instance'}
222228
debian-12-3006-10: {extends: '.test_instance'}
223229
debian-11-3006-10: {extends: '.test_instance'}
224-
ubuntu-2404-3006-10: {extends: '.test_instance'}
225-
ubuntu-2204-3006-10: {extends: '.test_instance'}
226-
ubuntu-2004-3006-10: {extends: '.test_instance'}
227-
centos-stream9-3006-10: {extends: '.test_instance'}
230+
fedora-41-3006-10: {extends: '.test_instance_failure_permitted'}
231+
fedora-40-3006-10: {extends: '.test_instance'}
228232
opensuse-leap-156-3006-10: {extends: '.test_instance'}
229233
opensuse-leap-155-3006-10: {extends: '.test_instance'}
230234
opensuse-tmbl-latest-3006-10: {extends: '.test_instance'}
231-
fedora-41-3006-10: {extends: '.test_instance_failure_permitted'}
232-
fedora-40-3006-10: {extends: '.test_instance'}
233-
amazonlinux-2-3006-10: {extends: '.test_instance_failure_permitted'}
234-
amazonlinux-2023-3006-10: {extends: '.test_instance'}
235235
oraclelinux-9-3006-10: {extends: '.test_instance'}
236236
oraclelinux-8-3006-10: {extends: '.test_instance'}
237-
almalinux-9-3006-10: {extends: '.test_instance'}
238-
almalinux-8-3006-10: {extends: '.test_instance'}
239237
rockylinux-9-3006-10: {extends: '.test_instance'}
240238
rockylinux-8-3006-10: {extends: '.test_instance'}
239+
ubuntu-2404-3006-10: {extends: '.test_instance'}
240+
ubuntu-2204-3006-10: {extends: '.test_instance'}
241+
ubuntu-2004-3006-10: {extends: '.test_instance'}
241242
# yamllint enable rule:line-length
242243

243244
###############################################################################

0 commit comments

Comments
 (0)