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

* Automated using myii/ssf-formula#345
saltstack-formulas · Jul 18, 2021 · ac1d3b9 · ac1d3b9
1 parent 5cc8759
commit ac1d3b9
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 14 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance:
+.test_instance: &test_instance
   stage: *stage_test
   image: *image_dindruby
   services: *services_docker_dind
@@ -117,13 +117,21 @@ 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`
-v3003-py3-debian-10-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-debian-11-3003-1-py3: {extends: '.test_instance_failure_permitted'}
+# v3003-py3-debian-10-3003-1-py3: {extends: '.test_instance'}
 # v3003-py3-debian-9-3003-1-py3: {extends: '.test_instance'}
 v3003-py3-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
 # v3003-py3-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
@@ -140,8 +148,9 @@ v3003-py3-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
 v3003-py3-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
 v3003-py3-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
 v3003-py3-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
-# v3002-py3-debian-10-3002-6-py3: {extends: '.test_instance'}
-v3002-py3-debian-9-3002-6-py3: {extends: '.test_instance'}
+# v3002-py3-debian-11-3002-6-py3: {extends: '.test_instance'}
+v3002-py3-debian-10-3002-6-py3: {extends: '.test_instance'}
+# v3002-py3-debian-9-3002-6-py3: {extends: '.test_instance'}
 v3002-py3-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
 # v3002-py3-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
 # v3002-py3-centos-8-3002-6-py3: {extends: '.test_instance'}

diff --git a/.travis.yml b/.travis.yml
@@ -83,7 +83,8 @@ 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=v3003-py3-debian-10-3003-1-py3
+    - env: INSTANCE=v3003-py3-debian-11-3003-1-py3
+    # - env: INSTANCE=v3003-py3-debian-10-3003-1-py3
     # - env: INSTANCE=v3003-py3-debian-9-3003-1-py3
     - env: INSTANCE=v3003-py3-ubuntu-2004-3003-1-py3
     # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-1-py3
@@ -100,8 +101,9 @@ jobs:
     - env: INSTANCE=v3003-py3-arch-base-latest-3003-1-py3
     - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-1-py3
     - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-1-py3
-    # - env: INSTANCE=v3002-py3-debian-10-3002-6-py3
-    - env: INSTANCE=v3002-py3-debian-9-3002-6-py3
+    # - env: INSTANCE=v3002-py3-debian-11-3002-6-py3
+    - env: INSTANCE=v3002-py3-debian-10-3002-6-py3
+    # - env: INSTANCE=v3002-py3-debian-9-3002-6-py3
     - env: INSTANCE=v3002-py3-ubuntu-2004-3002-6-py3
     # - env: INSTANCE=v3002-py3-ubuntu-1804-3002-6-py3
     # - env: INSTANCE=v3002-py3-centos-8-3002-6-py3

diff --git a/.yamllint b/.yamllint
@@ -5,14 +5,16 @@
 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
-# 7. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
+# 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
+# 8. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
 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
@@ -414,6 +430,7 @@ verifier:
 suites:
   - name: v3003-py3
     includes:
+      - debian-11-3003-1-py3
       - debian-10-3003-1-py3
       - debian-9-3003-1-py3
       - ubuntu-2004-3003-1-py3
@@ -457,6 +474,7 @@ suites:
         - path: test/integration/v3003-py3
   - name: v3002-py3
     includes:
+      - debian-11-3002-6-py3
       - debian-10-3002-6-py3
       - debian-9-3002-6-py3
       - ubuntu-2004-3002-6-py3