From 452afbe6ec675d60ba8896b071627752e7ab6f82 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 18 Jul 2021 18:57:51 +0100 Subject: [PATCH] ci: add Debian 11 Bullseye & update `yamllint` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/345 --- .gitlab-ci.yml | 4 ++++ .travis.yml | 4 ++++ .yamllint | 14 ++++++++------ kitchen.yml | 16 ++++++++++++++++ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8515a7..2264e03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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` +# default-debian-11-tiamat-py3: {extends: '.test_instance'} # default-debian-10-tiamat-py3: {extends: '.test_instance'} # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} @@ -134,6 +135,7 @@ rubocop: # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} # default-almalinux-8-tiamat-py3: {extends: '.test_instance'} # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} +default-debian-11-master-py3: {extends: '.test_instance'} default-debian-10-master-py3: {extends: '.test_instance'} default-debian-9-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} @@ -153,6 +155,7 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} default-almalinux-8-master-py3: {extends: '.test_instance'} default-rockylinux-8-master-py3: {extends: '.test_instance'} +# default-debian-11-3003-1-py3: {extends: '.test_instance'} # default-debian-10-3003-1-py3: {extends: '.test_instance'} # default-debian-9-3003-1-py3: {extends: '.test_instance'} # default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} @@ -170,6 +173,7 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'} # default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} +# default-debian-11-3002-6-py3: {extends: '.test_instance'} # default-debian-10-3002-6-py3: {extends: '.test_instance'} # default-debian-9-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index e9ff5c7..c22af73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,6 +105,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=default-debian-11-tiamat-py3 # - env: INSTANCE=default-debian-10-tiamat-py3 # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 @@ -116,6 +117,7 @@ jobs: # - env: INSTANCE=default-oraclelinux-7-tiamat-py3 # - env: INSTANCE=default-almalinux-8-tiamat-py3 # - env: INSTANCE=default-rockylinux-8-tiamat-py3 + - env: INSTANCE=default-debian-11-master-py3 - env: INSTANCE=default-debian-10-master-py3 - env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3 @@ -135,6 +137,7 @@ jobs: # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 - env: INSTANCE=default-almalinux-8-master-py3 - env: INSTANCE=default-rockylinux-8-master-py3 + # - env: INSTANCE=default-debian-11-3003-1-py3 # - env: INSTANCE=default-debian-10-3003-1-py3 # - env: INSTANCE=default-debian-9-3003-1-py3 # - env: INSTANCE=default-ubuntu-2004-3003-1-py3 @@ -152,6 +155,7 @@ jobs: # - env: INSTANCE=default-arch-base-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 + # - env: INSTANCE=default-debian-11-3002-6-py3 # - env: INSTANCE=default-debian-10-3002-6-py3 # - env: INSTANCE=default-debian-9-3002-6-py3 # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 diff --git a/.yamllint b/.yamllint index 72dc99f..716baaf 100644 --- a/.yamllint +++ b/.yamllint @@ -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/ diff --git a/kitchen.yml b/kitchen.yml index c46a6f2..4bba932 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -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 @@ -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 @@ -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 @@ -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