Skip to content

Commit 25d4626

Browse files
myiimyii
committed
ci: add Debian 11 Bullseye & update yamllint configuration [skip ci]
* Automated using myii/ssf-formula#345
1 parent bf107ff commit 25d4626

File tree

4 files changed

+46
-7
lines changed

4 files changed

+46
-7
lines changed

‎.gitlab-ci.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ rubocop:
102102
###############################################################################
103103
# Define `test` template
104104
###############################################################################
105-
.test_instance:
105+
.test_instance: &test_instance
106106
stage: *stage_test
107107
image: *image_dindruby
108108
services: *services_docker_dind
@@ -117,12 +117,20 @@ rubocop:
117117
# Alternative value to consider: `${CI_JOB_NAME}`
118118
- 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
119119

120+
###############################################################################
121+
# Define `test` template (`allow_failure: true`)
122+
###############################################################################
123+
.test_instance_failure_permitted:
124+
<<: *test_instance
125+
allow_failure: true
126+
120127
###############################################################################
121128
# `test` stage: each instance below uses the `test` template above
122129
###############################################################################
123130
## Define the rest of the matrix based on Kitchen testing
124131
# Make sure the instances listed below match up with
125132
# the `platforms` defined in `kitchen.yml`
133+
# default-debian-11-tiamat-py3: {extends: '.test_instance'}
126134
# default-debian-10-tiamat-py3: {extends: '.test_instance'}
127135
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
128136
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
@@ -134,6 +142,10 @@ rubocop:
134142
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
135143
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
136144
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
145+
# default-debian-11-master-py3: {extends: '.test_instance'}
146+
# archive-debian-11-master-py3: {extends: '.test_instance'}
147+
# source-debian-11-master-py3: {extends: '.test_instance'}
148+
repo-debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
137149
# default-debian-10-master-py3: {extends: '.test_instance'}
138150
# archive-debian-10-master-py3: {extends: '.test_instance'}
139151
# source-debian-10-master-py3: {extends: '.test_instance'}
@@ -210,6 +222,7 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
210222
# archive-rockylinux-8-master-py3: {extends: '.test_instance'}
211223
# source-rockylinux-8-master-py3: {extends: '.test_instance'}
212224
# repo-rockylinux-8-master-py3: {extends: '.test_instance'}
225+
# default-debian-11-3003-1-py3: {extends: '.test_instance'}
213226
# default-debian-10-3003-1-py3: {extends: '.test_instance'}
214227
# default-debian-9-3003-1-py3: {extends: '.test_instance'}
215228
# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
@@ -227,6 +240,7 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
227240
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
228241
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
229242
# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
243+
# default-debian-11-3002-6-py3: {extends: '.test_instance'}
230244
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
231245
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
232246
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}

‎.travis.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
## Define the rest of the matrix based on Kitchen testing
8484
# Make sure the instances listed below match up with
8585
# the `platforms` defined in `kitchen.yml`
86+
# - env: INSTANCE=default-debian-11-tiamat-py3
8687
# - env: INSTANCE=default-debian-10-tiamat-py3
8788
# - env: INSTANCE=default-debian-9-tiamat-py3
8889
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
@@ -94,6 +95,10 @@ jobs:
9495
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
9596
# - env: INSTANCE=default-almalinux-8-tiamat-py3
9697
# - env: INSTANCE=default-rockylinux-8-tiamat-py3
98+
# - env: INSTANCE=default-debian-11-master-py3
99+
# - env: INSTANCE=archive-debian-11-master-py3
100+
# - env: INSTANCE=source-debian-11-master-py3
101+
- env: INSTANCE=repo-debian-11-master-py3
97102
# - env: INSTANCE=default-debian-10-master-py3
98103
# - env: INSTANCE=archive-debian-10-master-py3
99104
# - env: INSTANCE=source-debian-10-master-py3
@@ -170,6 +175,7 @@ jobs:
170175
# - env: INSTANCE=archive-rockylinux-8-master-py3
171176
# - env: INSTANCE=source-rockylinux-8-master-py3
172177
# - env: INSTANCE=repo-rockylinux-8-master-py3
178+
# - env: INSTANCE=default-debian-11-3003-1-py3
173179
# - env: INSTANCE=default-debian-10-3003-1-py3
174180
# - env: INSTANCE=default-debian-9-3003-1-py3
175181
# - env: INSTANCE=default-ubuntu-2004-3003-1-py3
@@ -187,6 +193,7 @@ jobs:
187193
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
188194
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
189195
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
196+
# - env: INSTANCE=default-debian-11-3002-6-py3
190197
# - env: INSTANCE=default-debian-10-3002-6-py3
191198
# - env: INSTANCE=default-debian-9-3002-6-py3
192199
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3

‎.yamllint‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
extends: 'default'
66

77
# Files to ignore completely
8-
# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run
9-
# 2. All YAML files under directory `.git/`
10-
# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
11-
# 4. Any SLS files under directory `test/`, which are actually state files
12-
# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
13-
# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
8+
# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
9+
# 2. All YAML files under directory `.cache/`, introduced during the CI run
10+
# 3. All YAML files under directory `.git/`
11+
# 4. All YAML files under directory `node_modules/`, introduced during the CI run
12+
# 5. Any SLS files under directory `test/`, which are actually state files
13+
# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
14+
# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
1415
ignore: |
16+
.bundle/
1517
.cache/
1618
.git/
1719
node_modules/

‎kitchen.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ provisioner:
2020

2121
platforms:
2222
## SALT `tiamat`
23+
- name: debian-11-tiamat-py3
24+
driver:
25+
image: saltimages/salt-tiamat-py3:debian-11
26+
run_command: /lib/systemd/systemd
2327
- name: debian-10-tiamat-py3
2428
driver:
2529
image: saltimages/salt-tiamat-py3:debian-10
@@ -59,6 +63,10 @@ platforms:
5963
image: saltimages/salt-tiamat-py3:rockylinux-8
6064

6165
## SALT `master`
66+
- name: debian-11-master-py3
67+
driver:
68+
image: saltimages/salt-master-py3:debian-11
69+
run_command: /lib/systemd/systemd
6270
- name: debian-10-master-py3
6371
driver:
6472
image: saltimages/salt-master-py3:debian-10
@@ -135,6 +143,10 @@ platforms:
135143
image: saltimages/salt-master-py3:rockylinux-8
136144

137145
## SALT `3003.1`
146+
- name: debian-11-3003-1-py3
147+
driver:
148+
image: saltimages/salt-3003.1-py3:debian-11
149+
run_command: /lib/systemd/systemd
138150
- name: debian-10-3003-1-py3
139151
driver:
140152
image: saltimages/salt-3003.1-py3:debian-10
@@ -205,6 +217,10 @@ platforms:
205217
image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd
206218

207219
## SALT `3002.6`
220+
- name: debian-11-3002-6-py3
221+
driver:
222+
image: saltimages/salt-3002.6-py3:debian-11
223+
run_command: /lib/systemd/systemd
208224
- name: debian-10-3002-6-py3
209225
driver:
210226
image: saltimages/salt-3002.6-py3:debian-10

0 commit comments

Comments
 (0)