From 1e822d0855a1d46326fc5fa2559b302a18f6969c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 18 Jul 2021 18:58:26 +0100 Subject: [PATCH] ci: add Debian 11 Bullseye & update `yamllint` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/345 --- .github/workflows/kitchen.yml | 8 ++++++++ .travis.yml | 8 ++++++++ .yamllint | 14 ++++++++------ kitchen.yml | 28 ++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index cd774f1a..c02c43e7 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -17,6 +17,7 @@ jobs: fail-fast: false matrix: instance: + # - archive-debian-11-tiamat-py3 # - archive-debian-10-tiamat-py3 # - archive-debian-9-tiamat-py3 # - archive-ubuntu-2004-tiamat-py3 @@ -28,6 +29,11 @@ jobs: # - archive-oraclelinux-7-tiamat-py3 # - archive-almalinux-8-tiamat-py3 # - archive-rockylinux-8-tiamat-py3 + # - archive-debian-11-master-py3 + # - package-debian-11-master-py3 + # - repo-debian-11-master-py3 + # - clean-debian-11-master-py3 + - debian-11-master-py3 # - archive-debian-10-master-py3 # - package-debian-10-master-py3 # - repo-debian-10-master-py3 @@ -123,6 +129,7 @@ jobs: # - repo-rockylinux-8-master-py3 # - clean-rockylinux-8-master-py3 - rockylinux-8-master-py3 + # - archive-debian-11-3003-1-py3 # - archive-debian-10-3003-1-py3 # - archive-debian-9-3003-1-py3 # - archive-ubuntu-2004-3003-1-py3 @@ -140,6 +147,7 @@ jobs: # - archive-arch-base-latest-3003-1-py3 # - archive-gentoo-stage3-latest-3003-1-py3 # - archive-gentoo-stage3-systemd-3003-1-py3 + # - archive-debian-11-3002-6-py3 # - archive-debian-10-3002-6-py3 # - archive-debian-9-3002-6-py3 # - archive-ubuntu-2004-3002-6-py3 diff --git a/.travis.yml b/.travis.yml index 4e87d8b8..bcdb729b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,6 +91,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=archive-debian-11-tiamat-py3 # - env: INSTANCE=archive-debian-10-tiamat-py3 # - env: INSTANCE=archive-debian-9-tiamat-py3 # - env: INSTANCE=archive-ubuntu-2004-tiamat-py3 @@ -102,6 +103,11 @@ jobs: # - env: INSTANCE=archive-oraclelinux-7-tiamat-py3 # - env: INSTANCE=archive-almalinux-8-tiamat-py3 # - env: INSTANCE=archive-rockylinux-8-tiamat-py3 + # - env: INSTANCE=archive-debian-11-master-py3 + # - env: INSTANCE=package-debian-11-master-py3 + # - env: INSTANCE=repo-debian-11-master-py3 + # - env: INSTANCE=clean-debian-11-master-py3 + - env: INSTANCE=debian-11-master-py3 # - env: INSTANCE=archive-debian-10-master-py3 # - env: INSTANCE=package-debian-10-master-py3 # - env: INSTANCE=repo-debian-10-master-py3 @@ -197,6 +203,7 @@ jobs: # - env: INSTANCE=repo-rockylinux-8-master-py3 # - env: INSTANCE=clean-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 + # - env: INSTANCE=archive-debian-11-3003-1-py3 # - env: INSTANCE=archive-debian-10-3003-1-py3 # - env: INSTANCE=archive-debian-9-3003-1-py3 # - env: INSTANCE=archive-ubuntu-2004-3003-1-py3 @@ -214,6 +221,7 @@ jobs: # - env: INSTANCE=archive-arch-base-latest-3003-1-py3 # - env: INSTANCE=archive-gentoo-stage3-latest-3003-1-py3 # - env: INSTANCE=archive-gentoo-stage3-systemd-3003-1-py3 + # - env: INSTANCE=archive-debian-11-3002-6-py3 # - env: INSTANCE=archive-debian-10-3002-6-py3 # - env: INSTANCE=archive-debian-9-3002-6-py3 # - env: INSTANCE=archive-ubuntu-2004-3002-6-py3 diff --git a/.yamllint b/.yamllint index 17d0ef59..53b4494e 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 df66ae17..abd36f1b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -20,6 +20,13 @@ provisioner: platforms: ## SALT `tiamat` + - name: debian-11-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-11 + provision_command: + - apt-get update + - apt-get -qq -y install conntrack + run_command: /lib/systemd/systemd - name: debian-10-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:debian-10 @@ -81,6 +88,13 @@ 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 -qq -y install conntrack + run_command: /lib/systemd/systemd - name: debian-10-master-py3 driver: image: saltimages/salt-master-py3:debian-10 @@ -196,6 +210,13 @@ 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 -qq -y install conntrack + run_command: /lib/systemd/systemd - name: debian-10-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:debian-10 @@ -305,6 +326,13 @@ platforms: emerge --noreplace --quiet --with-bdeps-auto=n net-firewall/conntrack-tools ## 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 -qq -y install conntrack + run_command: /lib/systemd/systemd - name: debian-10-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:debian-10