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 f733e60 commit 00d778f
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 7 deletions.
13 changes: 12 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ rubocop:
###############################################################################
# Define `test` template
###############################################################################
.test_instance:
.test_instance: &test_instance
stage: *stage_test
image: *image_dindruby
services: *services_docker_dind
Expand All @@ -117,12 +117,20 @@ rubocop:
# Alternative value to consider: `${CI_JOB_NAME}`
- 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'

###############################################################################
# Define `test` template (`allow_failure: true`)
###############################################################################
.test_instance_failure_permitted:
<<: *test_instance
allow_failure: true

###############################################################################
# `test` stage: each instance below uses the `test` template above
###############################################################################
## 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`
# debian-debian-11-tiamat-py3: {extends: '.test_instance'}
# debian-debian-10-tiamat-py3: {extends: '.test_instance'}
# debian-debian-9-tiamat-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
Expand All @@ -134,6 +142,7 @@ rubocop:
# centos-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# redhat8-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# redhat8-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
debian-debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
debian-debian-10-master-py3: {extends: '.test_instance'}
debian-debian-9-master-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
Expand All @@ -153,6 +162,7 @@ gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
redhat8-almalinux-8-master-py3: {extends: '.test_instance'}
redhat8-rockylinux-8-master-py3: {extends: '.test_instance'}
# debian-debian-11-3003-1-py3: {extends: '.test_instance'}
# debian-debian-10-3003-1-py3: {extends: '.test_instance'}
# debian-debian-9-3003-1-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
Expand All @@ -170,6 +180,7 @@ redhat8-rockylinux-8-master-py3: {extends: '.test_instance'}
# arch-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
# debian-debian-11-3002-6-py3: {extends: '.test_instance'}
# debian-debian-10-3002-6-py3: {extends: '.test_instance'}
# debian-debian-9-3002-6-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
Expand Down
4 changes: 4 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=debian-debian-11-tiamat-py3
# - env: INSTANCE=debian-debian-10-tiamat-py3
# - env: INSTANCE=debian-debian-9-tiamat-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
Expand All @@ -94,6 +95,7 @@ jobs:
# - env: INSTANCE=centos-oraclelinux-7-tiamat-py3
# - env: INSTANCE=redhat8-almalinux-8-tiamat-py3
# - env: INSTANCE=redhat8-rockylinux-8-tiamat-py3
- env: INSTANCE=debian-debian-11-master-py3
- env: INSTANCE=debian-debian-10-master-py3
- env: INSTANCE=debian-debian-9-master-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
Expand All @@ -113,6 +115,7 @@ jobs:
- env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
- env: INSTANCE=redhat8-almalinux-8-master-py3
- env: INSTANCE=redhat8-rockylinux-8-master-py3
# - env: INSTANCE=debian-debian-11-3003-1-py3
# - env: INSTANCE=debian-debian-10-3003-1-py3
# - env: INSTANCE=debian-debian-9-3003-1-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
Expand All @@ -130,6 +133,7 @@ jobs:
# - env: INSTANCE=arch-arch-base-latest-3003-1-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3003-1-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3003-1-py3
# - env: INSTANCE=debian-debian-11-3002-6-py3
# - env: INSTANCE=debian-debian-10-3002-6-py3
# - env: INSTANCE=debian-debian-9-3002-6-py3
# - env: INSTANCE=ubuntu-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
36 changes: 36 additions & 0 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ provisioner:

platforms:
## SALT `tiamat`
- name: debian-11-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-11
provision_command:
- apt-get update
- apt-get install --reinstall -y udev
- apt-get install -y snapd
run_command: /lib/systemd/systemd
- name: debian-10-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-10
Expand Down Expand Up @@ -67,6 +75,14 @@ platforms:
image: saltimages/salt-tiamat-py3:rockylinux-8

## SALT `master`
- name: debian-11-master-py3
driver:
image: saltimages/salt-master-py3:debian-11
provision_command:
- apt-get update
- apt-get install --reinstall -y udev
- apt-get install -y snapd
run_command: /lib/systemd/systemd
- name: debian-10-master-py3
driver:
image: saltimages/salt-master-py3:debian-10
Expand Down Expand Up @@ -151,6 +167,14 @@ 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
provision_command:
- apt-get update
- apt-get install --reinstall -y udev
- apt-get install -y snapd
run_command: /lib/systemd/systemd
- name: debian-10-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:debian-10
Expand Down Expand Up @@ -229,6 +253,14 @@ 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
provision_command:
- apt-get update
- apt-get install --reinstall -y udev
- apt-get install -y snapd
run_command: /lib/systemd/systemd
- name: debian-10-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-10
Expand Down Expand Up @@ -462,12 +494,16 @@ verifier:
suites:
- name: debian
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

0 comments on commit 00d778f

Please sign in to comment.