ci: add Debian 11 Bullseye & update yamllint configuration [skip ci]

* Automated using myii/ssf-formula#345
saltstack-formulas · Jul 18, 2021 · e14f830 · e14f830
1 parent 98edfd3
commit e14f830
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -144,7 +144,7 @@ rubocop:
     - 'bundle config set without "${BUNDLE_WITHOUT}"'
     - 'bundle install'
   script:
-    - 'bin/kitchen verify default-debian-10-tiamat-py3'
+    - 'bin/kitchen verify default-debian-11-master-py3'
 # REMOVEME>
 
 ###############################################################################
@@ -167,6 +167,7 @@ rubocop:
 #       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
 test-formula-conversion: {extends: '.test_conversion'}
 # REMOVEME>
+# 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'}
@@ -178,6 +179,7 @@ test-formula-conversion: {extends: '.test_conversion'}
 # 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'}
@@ -197,6 +199,7 @@ gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 gentoo-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'}
@@ -214,6 +217,7 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-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'}
+# 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
@@ -94,6 +94,7 @@ jobs:
     #       to allow for comprehensive local testing
     #       Ref: https://github.com/saltstack-formulas/template-formula/issues/118
     #       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
+    # - 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
@@ -105,6 +106,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
@@ -124,6 +126,7 @@ jobs:
     - env: INSTANCE=gentoo-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
@@ -141,6 +144,7 @@ jobs:
     # - env: INSTANCE=default-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=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
@@ -206,7 +210,7 @@ jobs:
         - '[ $(git rev-list HEAD --count) -eq 2 ]'
         # Quick visual check that correct files have been updated
         - git show --pretty="" --name-status
-        - bin/kitchen verify default-debian-10-tiamat-py3
+        - bin/kitchen verify default-debian-11-master-py3
     # REMOVEME>
 
     ## Define the release stage that runs `semantic-release`

diff --git 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
@@ -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