Skip to content

Commit

Permalink
ci: add Debian 11 Bullseye & update yamllint configuration [skip ci]
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#345
  • Loading branch information
myii committed Jul 18, 2021
1 parent d08806c commit 758d646
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 6 deletions.
7 changes: 7 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,15 @@ rubocop:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
# repositories-debian-11-tiamat-py3: {extends: '.test_instance'}
# repositories-debian-10-tiamat-py3: {extends: '.test_instance'}
# repositories-debian-9-tiamat-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# repositories-debian-11-master-py3: {extends: '.test_instance'}
# preferences-debian-11-master-py3: {extends: '.test_instance'}
# unattended-debian-11-master-py3: {extends: '.test_instance'}
debian-11-master-py3: {extends: '.test_instance'}
# repositories-debian-10-master-py3: {extends: '.test_instance'}
# preferences-debian-10-master-py3: {extends: '.test_instance'}
# unattended-debian-10-master-py3: {extends: '.test_instance'}
Expand All @@ -143,10 +148,12 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
# preferences-ubuntu-1804-master-py3: {extends: '.test_instance'}
# unattended-ubuntu-1804-master-py3: {extends: '.test_instance'}
ubuntu-1804-master-py3: {extends: '.test_instance'}
# repositories-debian-11-3003-1-py3: {extends: '.test_instance'}
# repositories-debian-10-3003-1-py3: {extends: '.test_instance'}
# repositories-debian-9-3003-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
# repositories-debian-11-3002-6-py3: {extends: '.test_instance'}
# repositories-debian-10-3002-6-py3: {extends: '.test_instance'}
# repositories-debian-9-3002-6-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
Expand Down
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,15 @@ jobs:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
# - env: INSTANCE=repositories-debian-11-tiamat-py3
# - env: INSTANCE=repositories-debian-10-tiamat-py3
# - env: INSTANCE=repositories-debian-9-tiamat-py3
# - env: INSTANCE=repositories-ubuntu-2004-tiamat-py3
# - env: INSTANCE=repositories-ubuntu-1804-tiamat-py3
# - env: INSTANCE=repositories-debian-11-master-py3
# - env: INSTANCE=preferences-debian-11-master-py3
# - env: INSTANCE=unattended-debian-11-master-py3
- env: INSTANCE=debian-11-master-py3
# - env: INSTANCE=repositories-debian-10-master-py3
# - env: INSTANCE=preferences-debian-10-master-py3
# - env: INSTANCE=unattended-debian-10-master-py3
Expand All @@ -103,10 +108,12 @@ jobs:
# - env: INSTANCE=preferences-ubuntu-1804-master-py3
# - env: INSTANCE=unattended-ubuntu-1804-master-py3
- env: INSTANCE=ubuntu-1804-master-py3
# - env: INSTANCE=repositories-debian-11-3003-1-py3
# - env: INSTANCE=repositories-debian-10-3003-1-py3
# - env: INSTANCE=repositories-debian-9-3003-1-py3
# - env: INSTANCE=repositories-ubuntu-2004-3003-1-py3
# - env: INSTANCE=repositories-ubuntu-1804-3003-1-py3
# - env: INSTANCE=repositories-debian-11-3002-6-py3
# - env: INSTANCE=repositories-debian-10-3002-6-py3
# - env: INSTANCE=repositories-debian-9-3002-6-py3
# - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3
Expand Down
14 changes: 8 additions & 6 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
extends: 'default'

# Files to ignore completely
# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run
# 2. All YAML files under directory `.git/`
# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
# 4. Any SLS files under directory `test/`, which are actually state files
# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
# 2. All YAML files under directory `.cache/`, introduced during the CI run
# 3. All YAML files under directory `.git/`
# 4. All YAML files under directory `node_modules/`, introduced during the CI run
# 5. Any SLS files under directory `test/`, which are actually state files
# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
ignore: |
.bundle/
.cache/
.git/
node_modules/
Expand Down
16 changes: 16 additions & 0 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ provisioner:

platforms:
## SALT `tiamat`
- name: debian-11-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-10
Expand All @@ -38,6 +42,10 @@ platforms:
run_command: /lib/systemd/systemd

## SALT `master`
- name: debian-11-master-py3
driver:
image: saltimages/salt-master-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-master-py3
driver:
image: saltimages/salt-master-py3:debian-10
Expand All @@ -56,6 +64,10 @@ platforms:
run_command: /lib/systemd/systemd

## SALT `3003.1`
- name: debian-11-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:debian-10
Expand All @@ -74,6 +86,10 @@ platforms:
run_command: /lib/systemd/systemd

## SALT `3002.6`
- name: debian-11-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-10
Expand Down

0 comments on commit 758d646

Please sign in to comment.