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 65772ab commit 46b391d
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ 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`
# git-debian-11-tiamat-py3: {extends: '.test_instance'}
# git-debian-10-tiamat-py3: {extends: '.test_instance'}
domains-debian-10-tiamat-py3: {extends: '.test_instance'}
# git-debian-9-tiamat-py3: {extends: '.test_instance'}
Expand All @@ -136,6 +137,9 @@ domains-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# git-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# git-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# git-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
# git-debian-11-master-py3: {extends: '.test_instance'}
deb-debian-11-master-py3: {extends: '.test_instance'}
# domains-debian-11-master-py3: {extends: '.test_instance'}
# git-debian-10-master-py3: {extends: '.test_instance'}
deb-debian-10-master-py3: {extends: '.test_instance'}
# domains-debian-10-master-py3: {extends: '.test_instance'}
Expand Down Expand Up @@ -170,6 +174,7 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
rpm-almalinux-8-master-py3: {extends: '.test_instance'}
# git-rockylinux-8-master-py3: {extends: '.test_instance'}
rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
# git-debian-11-3003-1-py3: {extends: '.test_instance'}
# git-debian-10-3003-1-py3: {extends: '.test_instance'}
# git-debian-9-3003-1-py3: {extends: '.test_instance'}
# git-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
Expand All @@ -187,6 +192,7 @@ rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
# git-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
# git-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
# git-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
# git-debian-11-3002-6-py3: {extends: '.test_instance'}
# git-debian-10-3002-6-py3: {extends: '.test_instance'}
# git-debian-9-3002-6-py3: {extends: '.test_instance'}
# git-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
Expand Down
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ 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=git-debian-11-tiamat-py3
# - env: INSTANCE=git-debian-10-tiamat-py3
- env: INSTANCE=domains-debian-10-tiamat-py3
# - env: INSTANCE=git-debian-9-tiamat-py3
Expand All @@ -96,6 +97,9 @@ jobs:
# - env: INSTANCE=git-oraclelinux-7-tiamat-py3
# - env: INSTANCE=git-almalinux-8-tiamat-py3
# - env: INSTANCE=git-rockylinux-8-tiamat-py3
# - env: INSTANCE=git-debian-11-master-py3
- env: INSTANCE=deb-debian-11-master-py3
# - env: INSTANCE=domains-debian-11-master-py3
# - env: INSTANCE=git-debian-10-master-py3
- env: INSTANCE=deb-debian-10-master-py3
# - env: INSTANCE=domains-debian-10-master-py3
Expand Down Expand Up @@ -130,6 +134,7 @@ jobs:
- env: INSTANCE=rpm-almalinux-8-master-py3
# - env: INSTANCE=git-rockylinux-8-master-py3
- env: INSTANCE=rpm-rockylinux-8-master-py3
# - env: INSTANCE=git-debian-11-3003-1-py3
# - env: INSTANCE=git-debian-10-3003-1-py3
# - env: INSTANCE=git-debian-9-3003-1-py3
# - env: INSTANCE=git-ubuntu-2004-3003-1-py3
Expand All @@ -147,6 +152,7 @@ jobs:
# - env: INSTANCE=git-arch-base-latest-3003-1-py3
# - env: INSTANCE=git-gentoo-stage3-latest-3003-1-py3
# - env: INSTANCE=git-gentoo-stage3-systemd-3003-1-py3
# - env: INSTANCE=git-debian-11-3002-6-py3
# - env: INSTANCE=git-debian-10-3002-6-py3
# - env: INSTANCE=git-debian-9-3002-6-py3
# - env: INSTANCE=git-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
24 changes: 24 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 Down Expand Up @@ -59,6 +63,10 @@ platforms:
image: saltimages/salt-tiamat-py3:rockylinux-8

## 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 Down Expand Up @@ -135,6 +143,10 @@ platforms:
image: saltimages/salt-master-py3:rockylinux-8

## 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 Down Expand Up @@ -205,6 +217,10 @@ platforms:
image: saltimages/salt-3003.1-py3:gentoo-stage3-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 Expand Up @@ -432,12 +448,16 @@ suites:
- path: test/integration/git
- name: deb
includes:
- debian-11-tiamat-py3
- debian-10-tiamat-py3
- debian-9-tiamat-py3
- debian-11-master-py3
- debian-10-master-py3
- debian-9-master-py3
- debian-11-3003-1-py3
- debian-10-3003-1-py3
- debian-9-3003-1-py3
- debian-11-3002-6-py3
- debian-10-3002-6-py3
- debian-9-3002-6-py3
- debian-10-3001-7-py3
Expand Down Expand Up @@ -533,18 +553,22 @@ suites:
- path: test/integration/rpm
- name: domains
includes:
- debian-11-tiamat-py3
- debian-10-tiamat-py3
- debian-9-tiamat-py3
- ubuntu-2004-tiamat-py3
- ubuntu-1804-tiamat-py3
- debian-11-master-py3
- debian-10-master-py3
- debian-9-master-py3
- ubuntu-2004-master-py3
- ubuntu-1804-master-py3
- debian-11-3003-1-py3
- debian-10-3003-1-py3
- debian-9-3003-1-py3
- ubuntu-2004-3003-1-py3
- ubuntu-1804-3003-1-py3
- debian-11-3002-6-py3
- debian-10-3002-6-py3
- debian-9-3002-6-py3
- ubuntu-2004-3002-6-py3
Expand Down

0 comments on commit 46b391d

Please sign in to comment.