Skip to content

Commit 1fa7c66

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

File tree

4 files changed

+33
-7
lines changed

4 files changed

+33
-7
lines changed

.gitlab-ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ rubocop:
123123
## Define the rest of the matrix based on Kitchen testing
124124
# Make sure the instances listed below match up with
125125
# the `platforms` defined in `kitchen.yml`
126+
# default-debian-11-tiamat-py3: {extends: '.test_instance'}
126127
# default-debian-10-tiamat-py3: {extends: '.test_instance'}
127128
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
128129
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
@@ -134,6 +135,7 @@ rubocop:
134135
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
135136
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
136137
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
138+
default-debian-11-master-py3: {extends: '.test_instance'}
137139
default-debian-10-master-py3: {extends: '.test_instance'}
138140
default-debian-9-master-py3: {extends: '.test_instance'}
139141
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
@@ -153,6 +155,7 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'}
153155
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
154156
default-almalinux-8-master-py3: {extends: '.test_instance'}
155157
default-rockylinux-8-master-py3: {extends: '.test_instance'}
158+
# default-debian-11-3003-1-py3: {extends: '.test_instance'}
156159
# default-debian-10-3003-1-py3: {extends: '.test_instance'}
157160
# default-debian-9-3003-1-py3: {extends: '.test_instance'}
158161
# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
@@ -170,6 +173,7 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
170173
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
171174
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
172175
# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
176+
# default-debian-11-3002-6-py3: {extends: '.test_instance'}
173177
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
174178
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
175179
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}

.travis.yml

+4
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,7 @@ 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
9799
- env: INSTANCE=default-debian-10-master-py3
98100
- env: INSTANCE=default-debian-9-master-py3
99101
- env: INSTANCE=default-ubuntu-2004-master-py3
@@ -113,6 +115,7 @@ jobs:
113115
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
114116
- env: INSTANCE=default-almalinux-8-master-py3
115117
- env: INSTANCE=default-rockylinux-8-master-py3
118+
# - env: INSTANCE=default-debian-11-3003-1-py3
116119
# - env: INSTANCE=default-debian-10-3003-1-py3
117120
# - env: INSTANCE=default-debian-9-3003-1-py3
118121
# - env: INSTANCE=default-ubuntu-2004-3003-1-py3
@@ -130,6 +133,7 @@ jobs:
130133
# - env: INSTANCE=default-arch-base-latest-3003-1-py3
131134
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
132135
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
136+
# - env: INSTANCE=default-debian-11-3002-6-py3
133137
# - env: INSTANCE=default-debian-10-3002-6-py3
134138
# - env: INSTANCE=default-debian-9-3002-6-py3
135139
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3

.yamllint

+9-7
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
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
14-
# 7. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
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
15+
# 8. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
1516
ignore: |
17+
.bundle/
1618
.cache/
1719
.git/
1820
node_modules/

kitchen.yml

+16
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)