Skip to content

Commit c22aba7

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

File tree

4 files changed

+36
-6
lines changed

4 files changed

+36
-6
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 0 deletions
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+
# debian-debian-11-tiamat-py3: {extends: '.test_instance'}
126127
# debian-debian-10-tiamat-py3: {extends: '.test_instance'}
127128
# debian-debian-9-tiamat-py3: {extends: '.test_instance'}
128129
# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
@@ -134,6 +135,7 @@ rubocop:
134135
# redhat-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
135136
# redhat-almalinux-8-tiamat-py3: {extends: '.test_instance'}
136137
# redhat-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
138+
debian-debian-11-master-py3: {extends: '.test_instance'}
137139
debian-debian-10-master-py3: {extends: '.test_instance'}
138140
debian-debian-9-master-py3: {extends: '.test_instance'}
139141
ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
@@ -150,6 +152,7 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
150152
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
151153
redhat-almalinux-8-master-py3: {extends: '.test_instance'}
152154
redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
155+
# debian-debian-11-3003-1-py3: {extends: '.test_instance'}
153156
# debian-debian-10-3003-1-py3: {extends: '.test_instance'}
154157
# debian-debian-9-3003-1-py3: {extends: '.test_instance'}
155158
# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
@@ -164,6 +167,7 @@ redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
164167
# redhat-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
165168
# redhat-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
166169
# redhat-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
170+
# debian-debian-11-3002-6-py3: {extends: '.test_instance'}
167171
# debian-debian-10-3002-6-py3: {extends: '.test_instance'}
168172
# debian-debian-9-3002-6-py3: {extends: '.test_instance'}
169173
# ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}

.travis.yml

Lines changed: 4 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=debian-debian-11-tiamat-py3
8687
# - env: INSTANCE=debian-debian-10-tiamat-py3
8788
# - env: INSTANCE=debian-debian-9-tiamat-py3
8889
# - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
@@ -94,6 +95,7 @@ jobs:
9495
# - env: INSTANCE=redhat-oraclelinux-7-tiamat-py3
9596
# - env: INSTANCE=redhat-almalinux-8-tiamat-py3
9697
# - env: INSTANCE=redhat-rockylinux-8-tiamat-py3
98+
- env: INSTANCE=debian-debian-11-master-py3
9799
- env: INSTANCE=debian-debian-10-master-py3
98100
- env: INSTANCE=debian-debian-9-master-py3
99101
- env: INSTANCE=ubuntu-ubuntu-2004-master-py3
@@ -110,6 +112,7 @@ jobs:
110112
- env: INSTANCE=redhat-oraclelinux-7-master-py3
111113
- env: INSTANCE=redhat-almalinux-8-master-py3
112114
- env: INSTANCE=redhat-rockylinux-8-master-py3
115+
# - env: INSTANCE=debian-debian-11-3003-1-py3
113116
# - env: INSTANCE=debian-debian-10-3003-1-py3
114117
# - env: INSTANCE=debian-debian-9-3003-1-py3
115118
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
@@ -124,6 +127,7 @@ jobs:
124127
# - env: INSTANCE=redhat-amazonlinux-2-3003-1-py3
125128
# - env: INSTANCE=redhat-oraclelinux-8-3003-1-py3
126129
# - env: INSTANCE=redhat-oraclelinux-7-3003-1-py3
130+
# - env: INSTANCE=debian-debian-11-3002-6-py3
127131
# - env: INSTANCE=debian-debian-10-3002-6-py3
128132
# - env: INSTANCE=debian-debian-9-3002-6-py3
129133
# - env: INSTANCE=ubuntu-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: 20 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
@@ -414,12 +430,16 @@ verifier:
414430
suites:
415431
- name: debian
416432
includes:
433+
- debian-11-tiamat-py3
417434
- debian-10-tiamat-py3
418435
- debian-9-tiamat-py3
436+
- debian-11-master-py3
419437
- debian-10-master-py3
420438
- debian-9-master-py3
439+
- debian-11-3003-1-py3
421440
- debian-10-3003-1-py3
422441
- debian-9-3003-1-py3
442+
- debian-11-3002-6-py3
423443
- debian-10-3002-6-py3
424444
- debian-9-3002-6-py3
425445
- debian-10-3001-7-py3

0 commit comments

Comments
 (0)