chore(release): 0.43.0 [skip ci]

# [0.43.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.42.0...v0.43.0) (2021-07-20) ### Bug Fixes * **redhat:** fix `pkg_deps` to be able to install PostgreSQL 13 ([060c8df](060c8df630)) ### Continuous Integration * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([1fa7c66](1fa7c66b83)) * use `default` & `repo` InSpec suites ([a6c8197](a6c81972a2)) * **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([e9da40b](e9da40b570)) ### Features * **codenamemap:** update to current supported Fedora versions ([8a11bd6](8a11bd679a)) ### Tests * **inspec:** move common controls to the `share` profile ([2214096](2214096362)) * **inspec:** rename all files to avoid unnecessary `_spec` suffix ([a1837c2](a1837c24f1)) * **pillar:** use separate pillars to test `default` & `repo` suites ([27473b9](27473b9865))
Merge pull request #315 from myii/feat/update-all-platforms-for-postgresql-13-inc-CI
2021-07-20 18:42:59 +00:00 · 2021-07-20 19:34:57 +01:00 · 2021-07-20 19:22:36 +01:00 · 2021-07-20 19:21:29 +01:00 · 2021-07-20 18:31:04 +01:00 · 2021-07-20 18:02:47 +01:00
41 changed files with 1612 additions and 546 deletions
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -0,0 +1,41 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 name: 'Kitchen Vagrant (FreeBSD)'
 'on': ['push', 'pull_request']
 env:
  KITCHEN_LOCAL_YAML: 'kitchen.vagrant.yml'
 jobs:
  test:
    runs-on: 'macos-10.15'
    strategy:
      fail-fast: false
      matrix:
        instance:
          - default-freebsd-130-master-py3
          # - freebsd-130-master-py3
          - default-freebsd-122-master-py3
          # - freebsd-122-master-py3
          - default-freebsd-114-master-py3
          # - freebsd-114-master-py3
          # - default-freebsd-130-3002-6-py3
          # - default-freebsd-122-3002-6-py3
          # - default-freebsd-114-3002-6-py3
    steps:
      - name: 'Check out code'
        uses: 'actions/checkout@v2'
      - name: 'Set up Bundler cache'
        uses: 'actions/cache@v1'
        with:
          path: 'vendor/bundle'
          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
          restore-keys: "${{ runner.os }}-gems-"
      - name: 'Run Bundler'
        run: |
          ruby --version
          bundle config path vendor/bundle
          bundle install --jobs 4 --retry 3
      - name: 'Run Test Kitchen'
        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ variables:
  DOCKER_DRIVER: 'overlay2'
 ###############################################################################
-# `lint` stage: `commitlint` & `pre-commit`
+# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
 ###############################################################################
 commitlint:
  stage: *stage_lint
@@ -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,87 +117,154 @@ 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`
 # 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'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
 # default-centos-8-tiamat-py3: {extends: '.test_instance'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
-default-debian-10-master-py3: {extends: '.test_instance'}
+# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
-default-debian-9-master-py3: {extends: '.test_instance'}
+# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
-default-ubuntu-2004-master-py3: {extends: '.test_instance'}
+# default-debian-11-master-py3: {extends: '.test_instance'}
-default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# repo-debian-11-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-master-py3: {extends: '.test_instance'}
+debian-11-master-py3: {extends: '.test_instance'}
-default-centos-8-master-py3: {extends: '.test_instance'}
+# default-debian-10-master-py3: {extends: '.test_instance'}
-default-centos-7-master-py3: {extends: '.test_instance'}
+# repo-debian-10-master-py3: {extends: '.test_instance'}
-default-fedora-33-master-py3: {extends: '.test_instance'}
+debian-10-master-py3: {extends: '.test_instance'}
-default-fedora-32-master-py3: {extends: '.test_instance'}
+# default-debian-9-master-py3: {extends: '.test_instance'}
-default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# repo-debian-9-master-py3: {extends: '.test_instance'}
 debian-9-master-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # repo-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # repo-ubuntu-1804-master-py3: {extends: '.test_instance'}
 ubuntu-1804-master-py3: {extends: '.test_instance'}
 # default-centos-8-master-py3: {extends: '.test_instance'}
 # repo-centos-8-master-py3: {extends: '.test_instance'}
 centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # repo-centos-7-master-py3: {extends: '.test_instance'}
 centos-7-master-py3: {extends: '.test_instance'}
 # default-fedora-34-master-py3: {extends: '.test_instance'}
 # repo-fedora-34-master-py3: {extends: '.test_instance'}
 fedora-34-master-py3: {extends: '.test_instance'}
 # default-fedora-33-master-py3: {extends: '.test_instance'}
 # repo-fedora-33-master-py3: {extends: '.test_instance'}
 fedora-33-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # repo-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # repo-opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
 opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
 default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
-default-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# repo-amazonlinux-2-master-py3: {extends: '.test_instance'}
 amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
 # repo-oraclelinux-8-master-py3: {extends: '.test_instance'}
 oraclelinux-8-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 # repo-oraclelinux-7-master-py3: {extends: '.test_instance'}
 oraclelinux-7-master-py3: {extends: '.test_instance'}
 default-arch-base-latest-master-py3: {extends: '.test_instance'}
 # arch-base-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 # gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-10-3002-2-py3: {extends: '.test_instance'}
+# gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-9-3002-2-py3: {extends: '.test_instance'}
+# default-almalinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
+# repo-almalinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
+almalinux-8-master-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
+# default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-centos-8-3002-2-py3: {extends: '.test_instance'}
+# repo-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-centos-7-3002-2-py3: {extends: '.test_instance'}
+rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-2-py3: {extends: '.test_instance'}
+# default-debian-11-3003-1-py3: {extends: '.test_instance'}
-# default-fedora-32-3002-2-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'}
 # default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
 # default-centos-8-3003-1-py3: {extends: '.test_instance'}
 # default-centos-7-3003-1-py3: {extends: '.test_instance'}
 # default-fedora-34-3003-1-py3: {extends: '.test_instance'}
 # default-fedora-33-3003-1-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3003-1-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'}
 # default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
 # default-centos-8-3002-6-py3: {extends: '.test_instance'}
 # default-centos-7-3002-6-py3: {extends: '.test_instance'}
 # default-fedora-34-3002-6-py3: {extends: '.test_instance'}
 # default-fedora-33-3002-6-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
 # default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
+# default-debian-10-3001-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
+# default-debian-9-3001-7-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
-default-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
+# default-centos-8-3001-7-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
+# default-centos-7-3001-7-py3: {extends: '.test_instance'}
-# default-debian-10-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
-# default-debian-9-3001-4-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
-# default-centos-8-3001-4-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
-# default-centos-7-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
-# default-fedora-32-3001-4-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
+# default-debian-10-3000-9-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
+# default-debian-9-3000-9-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
+# default-centos-8-3000-9-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
+# default-centos-7-3000-9-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
-# default-debian-10-3000-6-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
-# default-debian-9-3000-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
-# default-centos-8-3000-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
-# default-centos-7-3000-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
-# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
 # default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
 # default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
 # default-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
 ###############################################################################
 # `release` stage: `semantic-release`
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -52,4 +52,14 @@ repos:
      - id: rstcheck
        name: Check reST files using rstcheck
        exclude: 'docs/CHANGELOG.rst'
-        args: [--report=warning]
+  - repo: https://github.com/saltstack-formulas/mirrors-rst-lint
    rev: v1.3.2
    hooks:
      - id: rst-lint
        name: Check reST files using rst-lint
        exclude: |
            (?x)^(
                docs/CHANGELOG.rst|
                docs/TOFS_pattern.rst|
            )$
        additional_dependencies: [pygments==2.9.0]
--- a/.rstcheck.cfg
+++ b/.rstcheck.cfg
@@ -1,3 +1,4 @@
 [rstcheck]
-report=error
+report=info
 ignore_language=rst
 ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,7 +7,7 @@ Layout/LineLength:
  # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
  Max: 88
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
    - control
    - describe
  # Increase from default of `25`
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,81 +83,141 @@ 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
    # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
    # - env: INSTANCE=default-ubuntu-1604-tiamat-py3
    # - env: INSTANCE=default-centos-8-tiamat-py3
    # - env: INSTANCE=default-centos-7-tiamat-py3
    # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
    # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
    # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
-    - env: INSTANCE=default-debian-10-master-py3
+    # - env: INSTANCE=default-almalinux-8-tiamat-py3
-    - env: INSTANCE=default-debian-9-master-py3
+    # - env: INSTANCE=default-rockylinux-8-tiamat-py3
-    - env: INSTANCE=default-ubuntu-2004-master-py3
+    # - env: INSTANCE=default-debian-11-master-py3
-    - env: INSTANCE=default-ubuntu-1804-master-py3
+    # - env: INSTANCE=repo-debian-11-master-py3
-    # - env: INSTANCE=default-ubuntu-1604-master-py3
+    - env: INSTANCE=debian-11-master-py3
-    - env: INSTANCE=default-centos-8-master-py3
+    # - env: INSTANCE=default-debian-10-master-py3
-    - env: INSTANCE=default-centos-7-master-py3
+    # - env: INSTANCE=repo-debian-10-master-py3
-    - env: INSTANCE=default-fedora-33-master-py3
+    - env: INSTANCE=debian-10-master-py3
-    - env: INSTANCE=default-fedora-32-master-py3
+    # - env: INSTANCE=default-debian-9-master-py3
-    - env: INSTANCE=default-opensuse-leap-152-master-py3
+    # - env: INSTANCE=repo-debian-9-master-py3
    - env: INSTANCE=debian-9-master-py3
    # - env: INSTANCE=default-ubuntu-2004-master-py3
    # - env: INSTANCE=repo-ubuntu-2004-master-py3
    - env: INSTANCE=ubuntu-2004-master-py3
    # - env: INSTANCE=default-ubuntu-1804-master-py3
    # - env: INSTANCE=repo-ubuntu-1804-master-py3
    - env: INSTANCE=ubuntu-1804-master-py3
    # - env: INSTANCE=default-centos-8-master-py3
    # - env: INSTANCE=repo-centos-8-master-py3
    - env: INSTANCE=centos-8-master-py3
    # - env: INSTANCE=default-centos-7-master-py3
    # - env: INSTANCE=repo-centos-7-master-py3
    - env: INSTANCE=centos-7-master-py3
    # - env: INSTANCE=default-fedora-34-master-py3
    # - env: INSTANCE=repo-fedora-34-master-py3
    - env: INSTANCE=fedora-34-master-py3
    # - env: INSTANCE=default-fedora-33-master-py3
    # - env: INSTANCE=repo-fedora-33-master-py3
    - env: INSTANCE=fedora-33-master-py3
    # - env: INSTANCE=default-opensuse-leap-153-master-py3
    # - env: INSTANCE=repo-opensuse-leap-153-master-py3
    - env: INSTANCE=opensuse-leap-153-master-py3
    # - env: INSTANCE=default-opensuse-leap-152-master-py3
    # - env: INSTANCE=repo-opensuse-leap-152-master-py3
    - env: INSTANCE=opensuse-leap-152-master-py3
    - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
-    - env: INSTANCE=default-amazonlinux-2-master-py3
+    # - env: INSTANCE=opensuse-tmbl-latest-master-py3
-    - env: INSTANCE=default-oraclelinux-8-master-py3
+    # - env: INSTANCE=default-amazonlinux-2-master-py3
-    - env: INSTANCE=default-oraclelinux-7-master-py3
+    # - env: INSTANCE=repo-amazonlinux-2-master-py3
    - env: INSTANCE=amazonlinux-2-master-py3
    # - env: INSTANCE=default-oraclelinux-8-master-py3
    # - env: INSTANCE=repo-oraclelinux-8-master-py3
    - env: INSTANCE=oraclelinux-8-master-py3
    # - env: INSTANCE=default-oraclelinux-7-master-py3
    # - env: INSTANCE=repo-oraclelinux-7-master-py3
    - env: INSTANCE=oraclelinux-7-master-py3
    - env: INSTANCE=default-arch-base-latest-master-py3
    # - env: INSTANCE=arch-base-latest-master-py3
    # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
    # - env: INSTANCE=gentoo-stage3-latest-master-py3
    # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=default-debian-10-3002-2-py3
+    # - env: INSTANCE=gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=default-debian-9-3002-2-py3
+    # - env: INSTANCE=default-almalinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-2-py3
+    # - env: INSTANCE=repo-almalinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-2-py3
+    - env: INSTANCE=almalinux-8-master-py3
-    # - env: INSTANCE=default-ubuntu-1604-3002-2-py3
+    # - env: INSTANCE=default-rockylinux-8-master-py3
-    # - env: INSTANCE=default-centos-8-3002-2-py3
+    # - env: INSTANCE=repo-rockylinux-8-master-py3
-    # - env: INSTANCE=default-centos-7-3002-2-py3
+    - env: INSTANCE=rockylinux-8-master-py3
-    # - env: INSTANCE=default-fedora-33-3002-2-py3
+    # - env: INSTANCE=default-debian-11-3003-1-py3
-    # - env: INSTANCE=default-fedora-32-3002-2-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
    # - env: INSTANCE=default-ubuntu-1804-3003-1-py3
    # - env: INSTANCE=default-centos-8-3003-1-py3
    # - env: INSTANCE=default-centos-7-3003-1-py3
    # - env: INSTANCE=default-fedora-34-3003-1-py3
    # - env: INSTANCE=default-fedora-33-3003-1-py3
    # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3
    # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3
    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3
    # - env: INSTANCE=default-amazonlinux-2-3003-1-py3
    # - env: INSTANCE=default-oraclelinux-8-3003-1-py3
    # - env: INSTANCE=default-oraclelinux-7-3003-1-py3
    # - 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
    # - env: INSTANCE=default-ubuntu-1804-3002-6-py3
    # - env: INSTANCE=default-centos-8-3002-6-py3
    # - env: INSTANCE=default-centos-7-3002-6-py3
    # - env: INSTANCE=default-fedora-34-3002-6-py3
    # - env: INSTANCE=default-fedora-33-3002-6-py3
    # - env: INSTANCE=default-amazonlinux-2-3002-6-py3
    # - env: INSTANCE=default-oraclelinux-8-3002-6-py3
    # - env: INSTANCE=default-oraclelinux-7-3002-6-py3
    # - env: INSTANCE=default-arch-base-latest-3002-6-py3
    # - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3
    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3
    # - env: INSTANCE=default-opensuse-leap-153-3002-2-py3
    # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-2-py3
+    # - env: INSTANCE=default-debian-10-3001-7-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-2-py3
+    # - env: INSTANCE=default-debian-9-3001-7-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-2004-3001-7-py3
-    - env: INSTANCE=default-arch-base-latest-3002-2-py3
+    # - env: INSTANCE=default-ubuntu-1804-3001-7-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3002-2-py3
+    # - env: INSTANCE=default-centos-8-3001-7-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-2-py3
+    # - env: INSTANCE=default-centos-7-3001-7-py3
-    # - env: INSTANCE=default-debian-10-3001-4-py3
+    # - env: INSTANCE=default-fedora-34-3001-7-py3
-    # - env: INSTANCE=default-debian-9-3001-4-py3
+    # - env: INSTANCE=default-fedora-33-3001-7-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-4-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3001-7-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-4-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
-    # - env: INSTANCE=default-ubuntu-1604-3001-4-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
-    # - env: INSTANCE=default-centos-8-3001-4-py3
+    # - env: INSTANCE=default-amazonlinux-2-3001-7-py3
-    # - env: INSTANCE=default-centos-7-3001-4-py3
+    # - env: INSTANCE=default-oraclelinux-8-3001-7-py3
-    # - env: INSTANCE=default-fedora-33-3001-4-py3
+    # - env: INSTANCE=default-oraclelinux-7-3001-7-py3
-    # - env: INSTANCE=default-fedora-32-3001-4-py3
+    # - env: INSTANCE=default-arch-base-latest-3001-7-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-4-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-4-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-4-py3
+    # - env: INSTANCE=default-debian-10-3000-9-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-4-py3
+    # - env: INSTANCE=default-debian-9-3000-9-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-4-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-9-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-4-py3
+    # - env: INSTANCE=default-centos-8-3000-9-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-4-py3
+    # - env: INSTANCE=default-centos-7-3000-9-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-4-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3000-9-py3
-    # - env: INSTANCE=default-debian-10-3000-6-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
-    # - env: INSTANCE=default-debian-9-3000-6-py3
+    # - env: INSTANCE=default-amazonlinux-2-3000-9-py3
-    # - env: INSTANCE=default-ubuntu-1804-3000-6-py3
+    # - env: INSTANCE=default-oraclelinux-8-3000-9-py3
-    # - env: INSTANCE=default-ubuntu-1604-3000-6-py3
+    # - env: INSTANCE=default-oraclelinux-7-3000-9-py3
-    # - env: INSTANCE=default-centos-8-3000-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3
-    # - env: INSTANCE=default-centos-7-3000-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3000-6-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-9-py2
-    # - env: INSTANCE=default-amazonlinux-2-3000-6-py3
+    # - env: INSTANCE=default-arch-base-latest-3000-9-py2
    # - env: INSTANCE=default-oraclelinux-8-3000-6-py3
    # - env: INSTANCE=default-oraclelinux-7-3000-6-py3
    # - env: INSTANCE=default-gentoo-stage3-latest-3000-6-py3
    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-6-py3
    # - env: INSTANCE=default-ubuntu-1804-3000-6-py2
    # - env: INSTANCE=default-ubuntu-1604-3000-6-py2
    # - env: INSTANCE=default-arch-base-latest-3000-6-py2
    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/.yamllint
+++ b/.yamllint
@@ -2,18 +2,25 @@
 # vim: ft=yaml
 ---
 # Extend the `default` configuration provided by `yamllint`
-extends: default
+extends: 'default'
 # Files to ignore completely
-# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
+# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
-# 2. Any SLS files under directory `test/`, which are actually state files
+# 2. All YAML files under directory `.cache/`, introduced during the CI run
-# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 3. All YAML files under directory `.git/`
-# 4. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
+# 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/
  test/**/states/**/*.sls
  .kitchen/
  kitchen.vagrant.yml
  pillar.example
  postgres/codenamemap.yaml
  postgres/osfamilymap.yaml
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|137
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|166
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|74
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|78
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|54
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|41
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|21
@@ -20,7 +20,6 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13106485?v=4' width='36' height='36' alt='@dynjnelson'>|[@dynjnelson](https://github.com/dynjnelson)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3449635?v=4' width='36' height='36' alt='@rominf'>|[@rominf](https://github.com/rominf)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/223763?v=4' width='36' height='36' alt='@alfredopalhares'>|[@alfredopalhares](https://github.com/alfredopalhares)|6
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|5
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyfeldroy'>|[@audreyfeldroy](https://github.com/audreyfeldroy)|5
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/278900?v=4' width='36' height='36' alt='@blast-hardcheese'>|[@blast-hardcheese](https://github.com/blast-hardcheese)|5
@@ -55,6 +54,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3705387?v=4' width='36' height='36' alt='@mbrannigan'>|[@mbrannigan](https://github.com/mbrannigan)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/8399114?v=4' width='36' height='36' alt='@fortunejuggle'>|[@fortunejuggle](https://github.com/fortunejuggle)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/152786?v=4' width='36' height='36' alt='@droope'>|[@droope](https://github.com/droope)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/219695?v=4' width='36' height='36' alt='@rmoorman'>|[@rmoorman](https://github.com/rmoorman)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/154676?v=4' width='36' height='36' alt='@skurfer'>|[@skurfer](https://github.com/skurfer)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2592431?v=4' width='36' height='36' alt='@RobRuana'>|[@RobRuana](https://github.com/RobRuana)|1
@@ -72,4 +72,4 @@ Avatar|Contributor|Contributions
 ---
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-02-26.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-07-20.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,89 @@
 # Changelog
 # [0.43.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.42.0...v0.43.0) (2021-07-20)
 ### Bug Fixes
 * **redhat:** fix `pkg_deps` to be able to install PostgreSQL 13 ([060c8df](https://github.com/saltstack-formulas/postgres-formula/commit/060c8df630ea4077a3d5a2b301fed56ed6ce1a45))
 ### Continuous Integration
 * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([1fa7c66](https://github.com/saltstack-formulas/postgres-formula/commit/1fa7c66b8361357fc5372552ec713fd2dca15883))
 * use `default` & `repo` InSpec suites ([a6c8197](https://github.com/saltstack-formulas/postgres-formula/commit/a6c81972a2c722d1dc3637acb412a8e1e513c998))
 * **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([e9da40b](https://github.com/saltstack-formulas/postgres-formula/commit/e9da40b5707d1e3d7f55f0b526e89c917418d4f5))
 ### Features
 * **codenamemap:** update to current supported Fedora versions ([8a11bd6](https://github.com/saltstack-formulas/postgres-formula/commit/8a11bd679a8a6175c796294dd0a5c759725de25d))
 ### Tests
 * **inspec:** move common controls to the `share` profile ([2214096](https://github.com/saltstack-formulas/postgres-formula/commit/221409636290444aa06ef9e59fd324b94412a635))
 * **inspec:** rename all files to avoid unnecessary `_spec` suffix ([a1837c2](https://github.com/saltstack-formulas/postgres-formula/commit/a1837c24f1b5210964e74f576805470f6db1a0cf))
 * **pillar:** use separate pillars to test `default` & `repo` suites ([27473b9](https://github.com/saltstack-formulas/postgres-formula/commit/27473b9865e8d716aa991cd33e9e186815933483))
 # [0.42.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.9...v0.42.0) (2021-07-15)
 ### Features
 * **debian:** add bullseye support ([216192d](https://github.com/saltstack-formulas/postgres-formula/commit/216192dece7d275e189666c55d76456fbdde1b57))
 ## [0.41.9](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.8...v0.41.9) (2021-07-06)
 ### Bug Fixes
 * **osmap.yaml:** fix PGDG repo file creation for Amazon Linux ([2de775b](https://github.com/saltstack-formulas/postgres-formula/commit/2de775be1e3e77b2bd71cb0a0a6fa587498c10e7))
 ### Continuous Integration
 * **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([d16e91c](https://github.com/saltstack-formulas/postgres-formula/commit/d16e91ceb03411f58c98cbb919f65b3f3eb4abbb))
 * **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([b690bab](https://github.com/saltstack-formulas/postgres-formula/commit/b690bab978901f9bea7c9b043ebce5a8f520f4b9))
 ## [0.41.8](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.7...v0.41.8) (2021-05-25)
 ### Bug Fixes
 * **jinja:** use json filter ([eb63ec8](https://github.com/saltstack-formulas/postgres-formula/commit/eb63ec85e0f2d15f929ffbf1d483211b7bf4e595))
 ### Continuous Integration
 * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([79feefa](https://github.com/saltstack-formulas/postgres-formula/commit/79feefa7519a5674496b8abfdc68e7baad75f950))
 * **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([fd8f0e5](https://github.com/saltstack-formulas/postgres-formula/commit/fd8f0e5db5c67f21c16910ab3ed696d59a7eeee2))
 * **vagrant:** add FreeBSD 13.0 [skip ci] ([93bb123](https://github.com/saltstack-formulas/postgres-formula/commit/93bb123ea1a8e5037c8898777ba90338979e802f))
 * **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([69812c1](https://github.com/saltstack-formulas/postgres-formula/commit/69812c1f62b90ba9094c873930ac334edac9a0aa))
 ### Documentation
 * **readme:** fix headings [skip ci] ([c97317c](https://github.com/saltstack-formulas/postgres-formula/commit/c97317c39fe46375a78b478c08210d25461548ff))
 ## [0.41.7](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.6...v0.41.7) (2021-03-26)
 ### Continuous Integration
 * enable Vagrant-based testing using GitHub Actions ([2ebc9c1](https://github.com/saltstack-formulas/postgres-formula/commit/2ebc9c11da512c8bc2089e8ecb28f5d3e13261f1))
 * **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([cc43d1c](https://github.com/saltstack-formulas/postgres-formula/commit/cc43d1c90db36c232012bc80b66baa248ece3c42))
 ### Documentation
 * **readme:** add `Testing with Vagrant` section ([ed2d688](https://github.com/saltstack-formulas/postgres-formula/commit/ed2d6884b10725fad55b83de4972e59710f1970f))
 ### Tests
 * standardise use of `share` suite & `_mapdata` state [skip ci] ([fc53d97](https://github.com/saltstack-formulas/postgres-formula/commit/fc53d977b32290834dc5aa17fe461154b269d38c))
 ## [0.41.6](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.5...v0.41.6) (2021-02-26)
--- a/2
+++ b/2
@@ -39,6 +39,8 @@
 /Gemfile                                    @saltstack-formulas/ssf
 /Gemfile.lock                               @saltstack-formulas/ssf
 /kitchen.yml                                @saltstack-formulas/ssf
 /kitchen.vagrant.yml                        @saltstack-formulas/ssf
 /kitchen.windows.yml                        @saltstack-formulas/ssf
 /pre-commit_semantic-release.sh             @saltstack-formulas/ssf
 /release-rules.js                           @saltstack-formulas/ssf
 /release.config.js                          @saltstack-formulas/ssf
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 name: postgres
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 0.41.6
+version: 0.43.0
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula
--- a/4
+++ b/4
@@ -5,12 +5,12 @@ source 'https://rubygems.org'
 # Use the latest version of `inspec` prior to `4.23.4`, which introduces a
 # regression where the diff isn't displayed when comparing using `eq`.
 gem 'inspec',      '~> 4.22.22'
-# Install the `kitchen-docker` gem from GitHub because the latest version
+# Install the `kitchen-docker` gem using `git` because the latest version
 # currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
 # rubocop:disable Layout/LineLength
 gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
 # rubocop:enable Layout/LineLength
-gem 'kitchen-inspec', '>= 2.2.1'
+gem 'kitchen-inspec', '>= 2.5.0'
 gem 'kitchen-salt', '>= 0.6.3'
 group :vagrant do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37
+  revision: 1f543f654da5c1774cb8737f6f07a01745520bb5
  branch: ssf
  specs:
    kitchen-docker (2.10.0)
@@ -9,197 +9,242 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (5.2.4.4)
+    activesupport (6.1.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-    addressable (2.7.0)
+      zeitwerk (~> 2.3)
    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
+    aws-eventstream (1.1.1)
-    aws-partitions (1.386.0)
+    aws-partitions (1.478.0)
-    aws-sdk-apigateway (1.55.0)
+    aws-sdk-apigateway (1.62.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.29.0)
+    aws-sdk-apigatewayv2 (1.32.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.33.0)
+    aws-sdk-applicationautoscaling (1.51.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.22.0)
+    aws-sdk-athena (1.37.0)
-      aws-sdk-core (~> 3, >= 3.52.1)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.36.0)
+    aws-sdk-autoscaling (1.61.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.44.0)
+    aws-sdk-batch (1.47.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.46.0)
+    aws-sdk-budgets (1.38.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.27.0)
+    aws-sdk-cloudformation (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.30.0)
+    aws-sdk-cloudfront (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.29.0)
+    aws-sdk-cloudhsm (1.30.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.45.0)
+    aws-sdk-cloudhsmv2 (1.33.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.38.0)
+    aws-sdk-cloudtrail (1.35.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.40.0)
+    aws-sdk-cloudwatch (1.51.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.37.0)
+    aws-sdk-cloudwatchevents (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.37.0)
+    aws-sdk-cloudwatchlogs (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.53.0)
+    aws-sdk-codecommit (1.42.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.109.1)
+    aws-sdk-codedeploy (1.40.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-codepipeline (1.44.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cognitoidentity (1.31.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cognitoidentityprovider (1.51.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-configservice (1.62.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-core (3.117.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-costandusagereportservice (1.28.0)
+    aws-sdk-costandusagereportservice (1.31.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.55.0)
+    aws-sdk-databasemigrationservice (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.202.0)
+    aws-sdk-dynamodb (1.60.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.39.0)
+    aws-sdk-ec2 (1.248.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.70.0)
+    aws-sdk-ecr (1.42.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.36.0)
+    aws-sdk-ecrpublic (1.3.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.45.0)
+    aws-sdk-ecs (1.80.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.44.0)
+    aws-sdk-efs (1.40.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.39.0)
+    aws-sdk-eks (1.58.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.29.0)
+    aws-sdk-elasticache (1.57.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.53.0)
+    aws-sdk-elasticbeanstalk (1.42.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.43.0)
+    aws-sdk-elasticloadbalancing (1.31.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.35.0)
+    aws-sdk-elasticloadbalancingv2 (1.62.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.42.0)
+    aws-sdk-elasticsearchservice (1.52.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.46.0)
+    aws-sdk-eventbridge (1.24.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.29.0)
+    aws-sdk-firehose (1.37.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.30.0)
+    aws-sdk-glue (1.87.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.39.0)
+    aws-sdk-guardduty (1.45.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.51.0)
+    aws-sdk-iam (1.56.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-organizations (1.17.0)
+    aws-sdk-kafka (1.36.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.0)
    aws-sdk-rds (1.104.0)
      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.50.0)
+    aws-sdk-kinesis (1.32.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.44.0)
+    aws-sdk-kms (1.44.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.28.0)
+    aws-sdk-lambda (1.63.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.21.0)
+    aws-sdk-organizations (1.59.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
+    aws-sdk-ram (1.25.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-rds (1.121.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-redshift (1.65.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-route53 (1.49.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-route53domains (1.30.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-route53resolver (1.26.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-s3 (1.96.1)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.35.0)
+    aws-sdk-secretsmanager (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.36.0)
+    aws-sdk-securityhub (1.47.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sms (1.27.0)
+    aws-sdk-servicecatalog (1.59.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.34.0)
+    aws-sdk-ses (1.38.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.34.0)
+    aws-sdk-shield (1.37.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.95.0)
+    aws-sdk-sms (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sdk-sns (1.42.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-sqs (1.40.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-ssm (1.112.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-states (1.39.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-transfer (1.32.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sigv4 (1.2.4)
      aws-eventstream (~> 1, >= 1.0.2)
    azure_graph_rbac (0.17.2)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_key_vault (0.17.6)
+    azure_mgmt_key_vault (0.17.7)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_resources (0.18.0)
+    azure_mgmt_resources (0.18.2)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_security (0.18.2)
+    azure_mgmt_security (0.19.0)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_storage (0.22.0)
+    azure_mgmt_storage (0.23.0)
      ms_rest_azure (~> 0.12.0)
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
    builder (3.2.4)
-    chef-config (16.6.14)
+    chef-config (17.2.29)
      addressable
-      chef-utils (= 16.6.14)
+      chef-utils (= 17.2.29)
      fuzzyurl
      mixlib-config (>= 2.2.12, < 4.0)
      mixlib-shellout (>= 2.0, < 4.0)
      tomlrb (~> 1.2)
-    chef-telemetry (1.0.14)
+    chef-telemetry (1.0.29)
      chef-config
      concurrent-ruby (~> 1.0)
-      ffi-yajl (~> 2.2)
+    chef-utils (17.2.29)
-    chef-utils (16.6.14)
+      concurrent-ruby
    coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
    declarative (0.0.20)
    declarative-option (0.1.0)
    diff-lcs (1.4.4)
-    docker-api (2.0.0)
+    docker-api (2.2.0)
      excon (>= 0.47.0)
      multi_json
    domain_name (0.5.20190701)
@@ -207,44 +252,43 @@ GEM
    ecma-re-validator (0.2.1)
      regexp_parser (~> 1.2)
    ed25519 (1.2.4)
-    erubi (1.9.0)
+    erubi (1.10.0)
-    excon (0.78.0)
+    excon (0.84.0)
-    faraday (0.17.3)
+    faraday (0.17.4)
      multipart-post (>= 1.2, < 3)
    faraday-cookie_jar (0.0.7)
      faraday (>= 0.8.0)
      http-cookie (~> 1.0.0)
    faraday_middleware (0.12.2)
      faraday (>= 0.7.4, < 1.0)
-    ffi (1.13.1)
+    ffi (1.15.3)
    ffi-yajl (2.3.4)
      libyajl2 (~> 1.2)
    fuzzyurl (0.9.0)
-    google-api-client (0.44.0)
+    google-api-client (0.52.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (~> 0.9)
      httpclient (>= 2.8.1, < 3.0)
      mini_mime (~> 1.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
      rexml
      signet (~> 0.12)
-    googleauth (0.13.0)
+    googleauth (0.14.0)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (~> 0.14)
-    gssapi (1.3.0)
+    gssapi (1.3.1)
      ffi (>= 1.0.1)
    gyoku (1.3.1)
      builder (>= 2.1.2)
-    hana (1.3.6)
+    hana (1.3.7)
    hashie (3.6.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
    inspec (4.22.22)
@@ -278,23 +322,22 @@ GEM
      tty-prompt (~> 0.17)
      tty-table (~> 0.10)
    jmespath (1.4.0)
-    json (2.3.1)
+    json (2.5.1)
    json_schemer (0.2.11)
      ecma-re-validator (~> 0.2)
      hana (~> 1.3)
      regexp_parser (~> 1.5)
      uri_template (~> 0.7)
-    jwt (2.2.2)
+    jwt (2.2.3)
-    kitchen-inspec (2.2.1)
+    kitchen-inspec (2.5.0)
-      hashie (~> 3.4)
+      hashie (>= 3.4, <= 5.0)
      inspec (>= 2.2.64, < 5.0)
-      test-kitchen (>= 2.7, < 3)
+      test-kitchen (>= 2.7, < 4)
    kitchen-salt (0.6.3)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
-    kitchen-vagrant (1.7.0)
+    kitchen-vagrant (1.9.0)
-      test-kitchen (>= 1.4, < 3)
+      test-kitchen (>= 1.4, < 4)
    libyajl2 (1.2.0)
    license-acceptance (1.0.19)
      pastel (~> 0.7)
      tomlrb (~> 1.2)
@@ -306,16 +349,16 @@ GEM
      multi_json (~> 1.14)
    memoist (0.16.2)
    method_source (1.0.0)
-    mini_mime (1.0.2)
+    mini_mime (1.1.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
    mixlib-config (3.0.9)
      tomlrb
-    mixlib-install (3.12.3)
+    mixlib-install (3.12.11)
      mixlib-shellout
      mixlib-versioning
      thor
    mixlib-log (3.0.9)
-    mixlib-shellout (3.1.6)
+    mixlib-shellout (3.2.5)
      chef-utils
    mixlib-versioning (1.2.12)
    ms_rest (0.7.6)
@@ -336,52 +379,54 @@ GEM
      net-ssh (>= 4.0.0)
    nori (2.6.0)
    os (1.1.1)
-    parallel (1.19.2)
+    parallel (1.20.1)
    parslet (1.8.2)
    pastel (0.8.0)
      tty-color (~> 0.5)
-    pry (0.13.1)
+    pry (0.14.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
    public_suffix (4.0.6)
    regexp_parser (1.8.2)
-    representable (3.0.4)
+    representable (3.1.1)
      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rspec (3.9.0)
+    rexml (3.2.5)
-      rspec-core (~> 3.9.0)
+    rspec (3.10.0)
-      rspec-expectations (~> 3.9.0)
+      rspec-core (~> 3.10.0)
-      rspec-mocks (~> 3.9.0)
+      rspec-expectations (~> 3.10.0)
-    rspec-core (3.9.3)
+      rspec-mocks (~> 3.10.0)
-      rspec-support (~> 3.9.3)
+    rspec-core (3.10.1)
-    rspec-expectations (3.9.3)
+      rspec-support (~> 3.10.0)
    rspec-expectations (3.10.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
    rspec-its (1.3.0)
      rspec-core (>= 3.0.0)
      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
-    rspec-support (3.9.4)
+    rspec-support (3.10.2)
-    rubyntlm (0.6.2)
+    rubyntlm (0.6.3)
    rubyzip (1.3.0)
    semverse (3.0.0)
-    signet (0.14.0)
+    signet (0.15.0)
      addressable (~> 2.3)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
-    strings (0.2.0)
+    strings (0.2.1)
      strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
+      unicode-display_width (>= 1.5, < 3.0)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
-    test-kitchen (2.7.2)
+    test-kitchen (3.0.0)
      bcrypt_pbkdf (~> 1.0)
      chef-utils (>= 16.4.35)
      ed25519 (~> 1.2)
      license-acceptance (>= 1.0.11, < 3.0)
      mixlib-install (~> 3.6)
@@ -393,28 +438,30 @@ GEM
      winrm (~> 2.0)
      winrm-elevated (~> 1.0)
      winrm-fs (~> 1.1)
-    thor (1.0.1)
+    thor (1.1.0)
    thread_safe (0.3.6)
    timeliness (0.3.10)
    tomlrb (1.2.9)
-    train (3.3.27)
+    trailblazer-option (0.1.1)
-      activesupport (>= 5.2.4.3, < 6.0.0)
+    train (3.7.4)
      activesupport (>= 6.0.3.1)
      azure_graph_rbac (~> 0.16)
      azure_mgmt_key_vault (~> 0.17)
      azure_mgmt_resources (~> 0.15)
      azure_mgmt_security (~> 0.18)
      azure_mgmt_storage (~> 0.18)
      docker-api (>= 1.26, < 3.0)
-      google-api-client (>= 0.23.9, < 0.44.1)
+      google-api-client (>= 0.23.9, <= 0.52.0)
-      googleauth (>= 0.6.6, < 0.13.1)
+      googleauth (>= 0.6.6, <= 0.14.0)
      inifile (~> 3.0)
-      train-core (= 3.3.27)
+      train-core (= 3.7.4)
      train-winrm (~> 0.2)
-    train-aws (0.1.18)
+    train-aws (0.2.8)
      aws-sdk-apigateway (~> 1.0)
      aws-sdk-apigatewayv2 (~> 1.0)
      aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
      aws-sdk-athena (~> 1.0)
-      aws-sdk-autoscaling (~> 1.22.0)
+      aws-sdk-autoscaling (>= 1.22, < 1.62)
      aws-sdk-batch (>= 1.36, < 1.48)
      aws-sdk-budgets (~> 1.0)
      aws-sdk-cloudformation (~> 1.0)
      aws-sdk-cloudfront (~> 1.0)
@@ -422,16 +469,21 @@ GEM
      aws-sdk-cloudhsmv2 (~> 1.0)
      aws-sdk-cloudtrail (~> 1.8)
      aws-sdk-cloudwatch (~> 1.13)
      aws-sdk-cloudwatchevents (>= 1.36, < 1.47)
      aws-sdk-cloudwatchlogs (~> 1.13)
      aws-sdk-codecommit (~> 1.0)
      aws-sdk-codedeploy (~> 1.0)
      aws-sdk-codepipeline (~> 1.0)
      aws-sdk-cognitoidentity (>= 1.26, < 1.32)
      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52)
      aws-sdk-configservice (~> 1.21)
      aws-sdk-core (~> 3.0)
      aws-sdk-costandusagereportservice (~> 1.6)
      aws-sdk-databasemigrationservice (>= 1.42, < 1.54)
      aws-sdk-dynamodb (~> 1.31)
      aws-sdk-ec2 (~> 1.70)
      aws-sdk-ecr (~> 1.18)
      aws-sdk-ecrpublic (~> 1.3)
      aws-sdk-ecs (~> 1.30)
      aws-sdk-efs (~> 1.0)
      aws-sdk-eks (~> 1.9)
@@ -440,48 +492,56 @@ GEM
      aws-sdk-elasticloadbalancing (~> 1.8)
      aws-sdk-elasticloadbalancingv2 (~> 1.0)
      aws-sdk-elasticsearchservice (~> 1.0)
      aws-sdk-eventbridge (~> 1.24.0)
      aws-sdk-firehose (~> 1.0)
      aws-sdk-glue (>= 1.71, < 1.88)
      aws-sdk-guardduty (~> 1.31)
      aws-sdk-iam (~> 1.13)
      aws-sdk-kafka (~> 1.0)
      aws-sdk-kinesis (~> 1.0)
      aws-sdk-kms (~> 1.13)
      aws-sdk-lambda (~> 1.0)
-      aws-sdk-organizations (~> 1.17.0)
+      aws-sdk-organizations (>= 1.17, < 1.60)
      aws-sdk-ram (>= 1.21, < 1.26)
      aws-sdk-rds (~> 1.43)
      aws-sdk-redshift (~> 1.0)
      aws-sdk-route53 (~> 1.0)
      aws-sdk-route53domains (~> 1.0)
      aws-sdk-route53resolver (~> 1.0)
      aws-sdk-s3 (~> 1.30)
      aws-sdk-secretsmanager (>= 1.42, < 1.47)
      aws-sdk-securityhub (~> 1.0)
      aws-sdk-servicecatalog (>= 1.48, < 1.60)
      aws-sdk-ses (~> 1.0)
      aws-sdk-shield (~> 1.30)
      aws-sdk-sms (~> 1.0)
      aws-sdk-sns (~> 1.9)
      aws-sdk-sqs (~> 1.10)
      aws-sdk-ssm (~> 1.0)
-    train-core (3.3.27)
+      aws-sdk-states (>= 1.35, < 1.40)
      aws-sdk-transfer (>= 1.26, < 1.33)
    train-core (3.7.4)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
      mixlib-shellout (>= 2.0, < 4.0)
      net-scp (>= 1.2, < 4.0)
      net-ssh (>= 2.9, < 7.0)
-    train-habitat (0.2.13)
+    train-habitat (0.2.22)
-    train-winrm (0.2.11)
+    train-winrm (0.2.12)
-      winrm (~> 2.0)
+      winrm (>= 2.3.6, < 3.0)
      winrm-elevated (~> 1.2.2)
      winrm-fs (~> 1.0)
-    tty-box (0.6.0)
+    tty-box (0.7.0)
      pastel (~> 0.8)
      strings (~> 0.2.0)
      tty-cursor (~> 0.7)
-    tty-color (0.5.2)
+    tty-color (0.6.0)
    tty-cursor (0.7.1)
-    tty-prompt (0.22.0)
+    tty-prompt (0.23.1)
      pastel (~> 0.8)
      tty-reader (~> 0.8)
-    tty-reader (0.8.0)
+    tty-reader (0.9.0)
      tty-cursor (~> 0.7)
      tty-screen (~> 0.8)
      wisper (~> 2.0)
@@ -490,16 +550,16 @@ GEM
      pastel (~> 0.8)
      strings (~> 0.2.0)
      tty-screen (~> 0.8)
-    tzinfo (1.2.7)
+    tzinfo (2.0.4)
-      thread_safe (~> 0.1)
+      concurrent-ruby (~> 1.0)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
    unicode_utils (1.4.0)
    uri_template (0.7.0)
-    winrm (2.3.5)
+    winrm (2.3.6)
      builder (>= 2.1.2)
      erubi (~> 1.8)
      gssapi (~> 1.2)
@@ -507,8 +567,8 @@ GEM
      httpclient (~> 2.2, >= 2.2.0.2)
      logging (>= 1.6.1, < 3.0)
      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.2)
+    winrm-elevated (1.2.3)
      erubi (~> 1.8)
      winrm (~> 2.0)
      winrm-fs (~> 1.0)
@@ -518,6 +578,7 @@ GEM
      rubyzip (~> 1.1)
      winrm (~> 2.0)
    wisper (2.0.1)
    zeitwerk (2.4.2)
 PLATFORMS
  ruby
@@ -525,7 +586,7 @@ PLATFORMS
 DEPENDENCIES
  inspec (~> 4.22.22)
  kitchen-docker!
-  kitchen-inspec (>= 2.2.1)
+  kitchen-inspec (>= 2.5.0)
  kitchen-salt (>= 0.6.3)
  kitchen-vagrant
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - Contributions
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
     - `@myii <https://github.com/myii>`_
-     - 137
+     - 166
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 74
+     - 78
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
     - `@aboe76 <https://github.com/aboe76>`_
     - 54
@@ -61,9 +61,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3449635?v=4' width='36' height='36' alt='@rominf'>`
     - `@rominf <https://github.com/rominf>`_
     - 7
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/223763?v=4' width='36' height='36' alt='@alfredopalhares'>`
     - `@alfredopalhares <https://github.com/alfredopalhares>`_
     - 6
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
     - `@alxwr <https://github.com/alxwr>`_
     - 5
@@ -166,6 +163,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/8399114?v=4' width='36' height='36' alt='@fortunejuggle'>`
     - `@fortunejuggle <https://github.com/fortunejuggle>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/152786?v=4' width='36' height='36' alt='@droope'>`
     - `@droope <https://github.com/droope>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/219695?v=4' width='36' height='36' alt='@rmoorman'>`
     - `@rmoorman <https://github.com/rmoorman>`_
     - 1
@@ -212,4 +212,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 ----
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-02-26.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-07-20.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,108 @@
 Changelog
 =========
 `0.43.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.42.0...v0.43.0>`_ (2021-07-20)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **redhat:** fix ``pkg_deps`` to be able to install PostgreSQL 13 (\ `060c8df <https://github.com/saltstack-formulas/postgres-formula/commit/060c8df630ea4077a3d5a2b301fed56ed6ce1a45>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `1fa7c66 <https://github.com/saltstack-formulas/postgres-formula/commit/1fa7c66b8361357fc5372552ec713fd2dca15883>`_\ )
 * use ``default`` & ``repo`` InSpec suites (\ `a6c8197 <https://github.com/saltstack-formulas/postgres-formula/commit/a6c81972a2c722d1dc3637acb412a8e1e513c998>`_\ )
 * **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `e9da40b <https://github.com/saltstack-formulas/postgres-formula/commit/e9da40b5707d1e3d7f55f0b526e89c917418d4f5>`_\ )
 Features
 ^^^^^^^^
 * **codenamemap:** update to current supported Fedora versions (\ `8a11bd6 <https://github.com/saltstack-formulas/postgres-formula/commit/8a11bd679a8a6175c796294dd0a5c759725de25d>`_\ )
 Tests
 ^^^^^
 * **inspec:** move common controls to the ``share`` profile (\ `2214096 <https://github.com/saltstack-formulas/postgres-formula/commit/221409636290444aa06ef9e59fd324b94412a635>`_\ )
 * **inspec:** rename all files to avoid unnecessary ``_spec`` suffix (\ `a1837c2 <https://github.com/saltstack-formulas/postgres-formula/commit/a1837c24f1b5210964e74f576805470f6db1a0cf>`_\ )
 * **pillar:** use separate pillars to test ``default`` & ``repo`` suites (\ `27473b9 <https://github.com/saltstack-formulas/postgres-formula/commit/27473b9865e8d716aa991cd33e9e186815933483>`_\ )
 `0.42.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.9...v0.42.0>`_ (2021-07-15)
 -------------------------------------------------------------------------------------------------------------
 Features
 ^^^^^^^^
 * **debian:** add bullseye support (\ `216192d <https://github.com/saltstack-formulas/postgres-formula/commit/216192dece7d275e189666c55d76456fbdde1b57>`_\ )
 `0.41.9 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.8...v0.41.9>`_ (2021-07-06)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **osmap.yaml:** fix PGDG repo file creation for Amazon Linux (\ `2de775b <https://github.com/saltstack-formulas/postgres-formula/commit/2de775be1e3e77b2bd71cb0a0a6fa587498c10e7>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `d16e91c <https://github.com/saltstack-formulas/postgres-formula/commit/d16e91ceb03411f58c98cbb919f65b3f3eb4abbb>`_\ )
 * **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `b690bab <https://github.com/saltstack-formulas/postgres-formula/commit/b690bab978901f9bea7c9b043ebce5a8f520f4b9>`_\ )
 `0.41.8 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.7...v0.41.8>`_ (2021-05-25)
 -------------------------------------------------------------------------------------------------------------
 Bug Fixes
 ^^^^^^^^^
 * **jinja:** use json filter (\ `eb63ec8 <https://github.com/saltstack-formulas/postgres-formula/commit/eb63ec85e0f2d15f929ffbf1d483211b7bf4e595>`_\ )
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `79feefa <https://github.com/saltstack-formulas/postgres-formula/commit/79feefa7519a5674496b8abfdc68e7baad75f950>`_\ )
 * **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `fd8f0e5 <https://github.com/saltstack-formulas/postgres-formula/commit/fd8f0e5db5c67f21c16910ab3ed696d59a7eeee2>`_\ )
 * **vagrant:** add FreeBSD 13.0 [skip ci] (\ `93bb123 <https://github.com/saltstack-formulas/postgres-formula/commit/93bb123ea1a8e5037c8898777ba90338979e802f>`_\ )
 * **vagrant:** use pre-salted boxes & conditional local settings [skip ci] (\ `69812c1 <https://github.com/saltstack-formulas/postgres-formula/commit/69812c1f62b90ba9094c873930ac334edac9a0aa>`_\ )
 Documentation
 ^^^^^^^^^^^^^
 * **readme:** fix headings [skip ci] (\ `c97317c <https://github.com/saltstack-formulas/postgres-formula/commit/c97317c39fe46375a78b478c08210d25461548ff>`_\ )
 `0.41.7 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.6...v0.41.7>`_ (2021-03-26)
 -------------------------------------------------------------------------------------------------------------
 Continuous Integration
 ^^^^^^^^^^^^^^^^^^^^^^
 * enable Vagrant-based testing using GitHub Actions (\ `2ebc9c1 <https://github.com/saltstack-formulas/postgres-formula/commit/2ebc9c11da512c8bc2089e8ecb28f5d3e13261f1>`_\ )
 * **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] (\ `cc43d1c <https://github.com/saltstack-formulas/postgres-formula/commit/cc43d1c90db36c232012bc80b66baa248ece3c42>`_\ )
 Documentation
 ^^^^^^^^^^^^^
 * **readme:** add ``Testing with Vagrant`` section (\ `ed2d688 <https://github.com/saltstack-formulas/postgres-formula/commit/ed2d6884b10725fad55b83de4972e59710f1970f>`_\ )
 Tests
 ^^^^^
 * standardise use of ``share`` suite & ``_mapdata`` state [skip ci] (\ `fc53d97 <https://github.com/saltstack-formulas/postgres-formula/commit/fc53d977b32290834dc5aa17fe461154b269d38c>`_\ )
 `0.41.6 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.5...v0.41.6>`_ (2021-02-26)
 -------------------------------------------------------------------------------------------------------------
--- a/docs/README.rst
+++ b/docs/README.rst
@@ -1,5 +1,3 @@
 .. _readme:
 postgres-formula
 ================
@@ -63,7 +61,7 @@ Creates such DB objects as: users, tablespaces, databases, schemas and extension
 See ``pillar.example`` file for details.
 ``postgres.python``
-^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^
 Installs the PostgreSQL adapter for Python on Linux.
@@ -119,17 +117,17 @@ Removal states
 Meta state to remove Postgres software. By default the release installed by formula is targeted only. To target multiple releases, set pillar ``postgres.remove.multiple_releases: True``.
 ``postgres.server.remove``
-^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 Remove server, lib, and contrib packages. The ``postgres.server.remove`` will retain data by default (no data loss) - set pillar ``postgres.remove.data: True`` to remove data and configuration directories also.
 ``postgres.client.remove``
-^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 Remove client package.
 ``postgres.dev.remove``
-^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^
 Remove development and python packages.
@@ -150,7 +148,7 @@ Creates the docker instance and runs the ``postgres`` main state, ready for test
 Runs the ``inspec`` tests on the actual instance.
 ``kitchen destroy``
-^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^
 Removes the docker instance.
@@ -164,4 +162,66 @@ Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``veri
 Gives you SSH access to the instance for manual testing.
 Testing with Vagrant
 --------------------
 Windows/FreeBSD/OpenBSD testing is done with ``kitchen-salt``.
 Requirements
 ^^^^^^^^^^^^
 * Ruby
 * Virtualbox
 * Vagrant
 Setup
 ^^^^^
 .. code-block:: bash
   $ gem install bundler
   $ bundle install --with=vagrant
   $ bin/kitchen test [platform]
 Where ``[platform]`` is the platform name defined in ``kitchen.vagrant.yml``,
 e.g. ``windows-81-latest-py3``.
 Note
 ^^^^
 When testing using Vagrant you must set the environment variable ``KITCHEN_LOCAL_YAML`` to ``kitchen.vagrant.yml``.  For example:
 .. code-block:: bash
   $ KITCHEN_LOCAL_YAML=kitchen.vagrant.yml bin/kitchen test      # Alternatively,
   $ export KITCHEN_LOCAL_YAML=kitchen.vagrant.yml
   $ bin/kitchen test
 Then run the following commands as needed.
 ``bin/kitchen converge``
 ^^^^^^^^^^^^^^^^^^^^^^^^
 Creates the Vagrant instance and runs the ``postgres`` main state, ready for testing.
 ``bin/kitchen verify``
 ^^^^^^^^^^^^^^^^^^^^^^
 Runs the ``inspec`` tests on the actual instance.
 ``bin/kitchen destroy``
 ^^^^^^^^^^^^^^^^^^^^^^^
 Removes the Vagrant instance.
 ``bin/kitchen test``
 ^^^^^^^^^^^^^^^^^^^^
 Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``verify`` + ``destroy``.
 ``bin/kitchen login``
 ^^^^^^^^^^^^^^^^^^^^^
 Gives you RDP/SSH access to the instance for manual testing.
 .. vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want sts=2 sw=2 et
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -3,15 +3,38 @@
 ---
 driver:
  name: vagrant
 platforms:
  - name: freebsd-120-2019-2-py3
    driver:
      box_url: https://freebsd.z.vstack.com/FreeBSD-12.0.box
  cache_directory: false
  customize:
    usbxhci: 'off'
  gui: false
      linked_clone: true
  ssh:
-        shell: '/bin/sh'
+    shell: /bin/sh
  <% unless ENV['CI'] %>
  linked_clone: true
  synced_folders:
    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
      - '/vagrant'
      - 'create: true, disabled: false'
  <% end %>
 platforms:
  - name: freebsd-130-master-py3
    driver:
      box: myii/freebsd-13.0-master-py3
      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
  - name: freebsd-122-master-py3
    driver:
      box: myii/freebsd-12.2-master-py3
  - name: freebsd-114-master-py3
    driver:
      box: myii/freebsd-11.4-master-py3
  - name: freebsd-130-3002-6-py3
    driver:
      box: myii/freebsd-13.0-3002.6-py3
      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
  - name: freebsd-122-3002-6-py3
    driver:
      box: myii/freebsd-12.2-3002.6-py3
  - name: freebsd-114-3002-6-py3
    driver:
      box: myii/freebsd-11.4-3002.6-py3
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -6,25 +6,40 @@ driver:
  name: docker
  use_sudo: false
  privileged: true
-  run_command: /lib/systemd/systemd
+  run_command: /usr/lib/systemd/systemd
 provisioner:
  name: salt_solo
  log_level: debug
  salt_install: none
  require_chef: false
  formula: postgres
  salt_copy_filter:
    - .kitchen
    - .git
 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
      run_command: /lib/systemd/systemd
  - name: debian-9-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:debian-9
      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-18.04
-  - name: ubuntu-1604-tiamat-py3
+      run_command: /lib/systemd/systemd
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-16.04
  - name: centos-8-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:centos-8
@@ -40,39 +55,56 @@ platforms:
  - name: oraclelinux-7-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:oraclelinux-7
  - name: almalinux-8-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:almalinux-8
  - name: rockylinux-8-tiamat-py3
    driver:
      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
      run_command: /lib/systemd/systemd
  - name: debian-9-master-py3
    driver:
      image: saltimages/salt-master-py3:debian-9
      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-18.04
-  - name: ubuntu-1604-master-py3
+      run_command: /lib/systemd/systemd
    driver:
      image: saltimages/salt-master-py3:ubuntu-16.04
  - name: centos-8-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-8
  - name: centos-7-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-7
  - name: fedora-34-master-py3
    driver:
      image: saltimages/salt-master-py3:fedora-34
  - name: fedora-33-master-py3
    driver:
      image: saltimages/salt-master-py3:fedora-33
-  - name: fedora-32-master-py3
+  - name: opensuse-leap-153-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-32
+      image: saltimages/salt-master-py3:opensuse-leap-15.3
    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: opensuse-leap-152-master-py3
    driver:
      image: saltimages/salt-master-py3:opensuse-leap-15.2
      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@@ -80,7 +112,6 @@ platforms:
  - name: opensuse-tmbl-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@@ -94,6 +125,9 @@ platforms:
  - name: oraclelinux-7-master-py3
    driver:
      image: saltimages/salt-master-py3:oraclelinux-7
  - name: arch-base-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:arch-base-latest
  - name: gentoo-stage3-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:gentoo-stage3-latest
@@ -101,39 +135,151 @@ platforms:
  - name: gentoo-stage3-systemd-master-py3
    driver:
      image: saltimages/salt-master-py3:gentoo-stage3-systemd
  - name: almalinux-8-master-py3
    driver:
      image: saltimages/salt-master-py3:almalinux-8
  - name: rockylinux-8-master-py3
    driver:
      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
      run_command: /lib/systemd/systemd
  - name: debian-9-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:debian-9
      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:ubuntu-18.04
      run_command: /lib/systemd/systemd
  - name: centos-8-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:centos-8
  - name: centos-7-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:centos-7
  - name: fedora-34-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:fedora-34
  - name: fedora-33-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:fedora-33
  - name: opensuse-leap-153-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: opensuse-leap-152-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: opensuse-tmbl-latest-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: amazonlinux-2-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:amazonlinux-2
  - name: oraclelinux-8-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:oraclelinux-8
  - name: oraclelinux-7-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:oraclelinux-7
  - name: arch-base-latest-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:arch-base-latest
  - name: gentoo-stage3-latest-3003-1-py3
    driver:
      image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
      run_command: /sbin/init
  - name: gentoo-stage3-systemd-3003-1-py3
    driver:
      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
      run_command: /lib/systemd/systemd
  - name: debian-9-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:debian-9
      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:ubuntu-18.04
      run_command: /lib/systemd/systemd
  - name: centos-8-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:centos-8
  - name: centos-7-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:centos-7
  - name: fedora-34-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:fedora-34
  - name: fedora-33-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:fedora-33
  - name: amazonlinux-2-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:amazonlinux-2
  - name: oraclelinux-8-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:oraclelinux-8
  - name: oraclelinux-7-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:oraclelinux-7
  - name: arch-base-latest-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:arch-base-latest
  - name: gentoo-stage3-latest-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
      run_command: /sbin/init
  - name: gentoo-stage3-systemd-3002-6-py3
    driver:
      image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd
  ## SALT `3002.2`
-  - name: debian-10-3002-2-py3
+  - name: opensuse-leap-153-3002-2-py3
    driver:
-      image: saltimages/salt-3002.2-py3:debian-10
+      image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
-  - name: debian-9-3002-2-py3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    driver:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-      image: saltimages/salt-3002.2-py3:debian-9
+    transport:
-  - name: ubuntu-2004-3002-2-py3
+      max_ssh_sessions: 1
    driver:
      image: saltimages/salt-3002.2-py3:ubuntu-20.04
  - name: ubuntu-1804-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:ubuntu-18.04
  - name: ubuntu-1604-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:ubuntu-16.04
  - name: centos-8-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:centos-8
  - name: centos-7-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:centos-7
  - name: fedora-33-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:fedora-33
  - name: fedora-32-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:fedora-32
  - name: opensuse-leap-152-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@@ -141,167 +287,144 @@ platforms:
  - name: opensuse-tmbl-latest-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: amazonlinux-2-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:amazonlinux-2
  - name: oraclelinux-8-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:oraclelinux-8
  - name: oraclelinux-7-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:oraclelinux-7
  - name: arch-base-latest-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:arch-base-latest
      run_command: /usr/lib/systemd/systemd
  - name: gentoo-stage3-latest-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:gentoo-stage3-latest
      run_command: /sbin/init
  - name: gentoo-stage3-systemd-3002-2-py3
    driver:
      image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd
-  ## SALT `3001.4`
+  ## SALT `3001.7`
-  - name: debian-10-3001-4-py3
+  - name: debian-10-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:debian-10
+      image: saltimages/salt-3001.7-py3:debian-10
-  - name: debian-9-3001-4-py3
+      run_command: /lib/systemd/systemd
  - name: debian-9-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:debian-9
+      image: saltimages/salt-3001.7-py3:debian-9
-  - name: ubuntu-2004-3001-4-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:ubuntu-20.04
+      image: saltimages/salt-3001.7-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-4-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:ubuntu-18.04
+      image: saltimages/salt-3001.7-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-4-py3
+      run_command: /lib/systemd/systemd
  - name: centos-8-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:ubuntu-16.04
+      image: saltimages/salt-3001.7-py3:centos-8
-  - name: centos-8-3001-4-py3
+  - name: centos-7-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:centos-8
+      image: saltimages/salt-3001.7-py3:centos-7
-  - name: centos-7-3001-4-py3
+  - name: fedora-34-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:centos-7
+      image: saltimages/salt-3001.7-py3:fedora-34
-  - name: fedora-33-3001-4-py3
+  - name: fedora-33-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:fedora-33
+      image: saltimages/salt-3001.7-py3:fedora-33
-  - name: fedora-32-3001-4-py3
+  - name: opensuse-leap-153-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:fedora-32
+      image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
-  - name: opensuse-leap-152-3001-4-py3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: opensuse-leap-152-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:opensuse-leap-15.2
+      image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3001-4-py3
+  - name: opensuse-tmbl-latest-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: amazonlinux-2-3001-4-py3
+  - name: amazonlinux-2-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:amazonlinux-2
+      image: saltimages/salt-3001.7-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-4-py3
+  - name: oraclelinux-8-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:oraclelinux-8
+      image: saltimages/salt-3001.7-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-4-py3
+  - name: oraclelinux-7-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:oraclelinux-7
+      image: saltimages/salt-3001.7-py3:oraclelinux-7
-  - name: arch-base-latest-3001-4-py3
+  - name: arch-base-latest-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:arch-base-latest
+      image: saltimages/salt-3001.7-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
+  - name: gentoo-stage3-latest-3001-7-py3
  - name: gentoo-stage3-latest-3001-4-py3
    driver:
-      image: saltimages/salt-3001.4-py3:gentoo-stage3-latest
+      image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-4-py3
+  - name: gentoo-stage3-systemd-3001-7-py3
    driver:
-      image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd
-  ## SALT `3000.6`
+  ## SALT `3000.9`
-  - name: debian-10-3000-6-py3
+  - name: debian-10-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:debian-10
+      image: saltimages/salt-3000.9-py3:debian-10
-  - name: debian-9-3000-6-py3
+      run_command: /lib/systemd/systemd
  - name: debian-9-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:debian-9
+      image: saltimages/salt-3000.9-py3:debian-9
-  - name: ubuntu-1804-3000-6-py3
+      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:ubuntu-18.04
+      image: saltimages/salt-3000.9-py3:ubuntu-18.04
-  - name: ubuntu-1604-3000-6-py3
+      run_command: /lib/systemd/systemd
  - name: centos-8-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:ubuntu-16.04
+      image: saltimages/salt-3000.9-py3:centos-8
-  - name: centos-8-3000-6-py3
+  - name: centos-7-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:centos-8
+      image: saltimages/salt-3000.9-py3:centos-7
-  - name: centos-7-3000-6-py3
+  - name: opensuse-leap-153-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:centos-7
+      image: saltimages/salt-3000.9-py3:opensuse-leap-15.3
-  - name: opensuse-leap-152-3000-6-py3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: opensuse-leap-152-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:opensuse-leap-15.2
+      image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: amazonlinux-2-3000-6-py3
+  - name: amazonlinux-2-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:amazonlinux-2
+      image: saltimages/salt-3000.9-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-6-py3
+  - name: oraclelinux-8-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:oraclelinux-8
+      image: saltimages/salt-3000.9-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-6-py3
+  - name: oraclelinux-7-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:oraclelinux-7
+      image: saltimages/salt-3000.9-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3000-6-py3
+  - name: gentoo-stage3-latest-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:gentoo-stage3-latest
+      image: saltimages/salt-3000.9-py3:gentoo-stage3-latest
      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3000-6-py3
+  - name: gentoo-stage3-systemd-3000-9-py3
    driver:
-      image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd
-  - name: ubuntu-1804-3000-6-py2
+  - name: ubuntu-1804-3000-9-py2
    driver:
-      image: saltimages/salt-3000.6-py2:ubuntu-18.04
+      image: saltimages/salt-3000.9-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-6-py2
+      run_command: /lib/systemd/systemd
  - name: arch-base-latest-3000-9-py2
    driver:
-      image: saltimages/salt-3000.6-py2:ubuntu-16.04
+      image: saltimages/salt-3000.9-py2:arch-base-latest
  - name: arch-base-latest-3000-6-py2
    driver:
      image: saltimages/salt-3000.6-py2:arch-base-latest
      run_command: /usr/lib/systemd/systemd
 provisioner:
  name: salt_solo
  log_level: debug
  salt_install: none
  require_chef: false
  formula: postgres
  salt_copy_filter:
    - .kitchen
    - .git
 verifier:
  # https://www.inspec.io/
  name: inspec
  sudo: true
  # cli, documentation, html, progress, json, json-min, json-rspec, junit
  reporter:
    # cli, documentation, html, progress, json, json-min, json-rspec, junit
    - cli
 suites:
@@ -310,6 +433,7 @@ suites:
      state_top:
        base:
          '*':
            - postgres._mapdata
            - postgres
      pillars:
        top.sls:
@@ -321,3 +445,103 @@ suites:
    verifier:
      inspec_tests:
        - path: test/integration/default
  - name: repo
    includes:
      - debian-11-tiamat-py3
      - debian-10-tiamat-py3
      - debian-9-tiamat-py3
      - ubuntu-2004-tiamat-py3
      - ubuntu-1804-tiamat-py3
      - centos-8-tiamat-py3
      - centos-7-tiamat-py3
      - amazonlinux-2-tiamat-py3
      - oraclelinux-8-tiamat-py3
      - oraclelinux-7-tiamat-py3
      - almalinux-8-tiamat-py3
      - rockylinux-8-tiamat-py3
      - debian-11-master-py3
      - debian-10-master-py3
      - debian-9-master-py3
      - ubuntu-2004-master-py3
      - ubuntu-1804-master-py3
      - centos-8-master-py3
      - centos-7-master-py3
      - fedora-34-master-py3
      - fedora-33-master-py3
      - opensuse-leap-153-master-py3
      - opensuse-leap-152-master-py3
      - amazonlinux-2-master-py3
      - oraclelinux-8-master-py3
      - oraclelinux-7-master-py3
      - almalinux-8-master-py3
      - rockylinux-8-master-py3
      - debian-11-3003-1-py3
      - debian-10-3003-1-py3
      - debian-9-3003-1-py3
      - ubuntu-2004-3003-1-py3
      - ubuntu-1804-3003-1-py3
      - centos-8-3003-1-py3
      - centos-7-3003-1-py3
      - fedora-34-3003-1-py3
      - fedora-33-3003-1-py3
      - opensuse-leap-153-3003-1-py3
      - opensuse-leap-152-3003-1-py3
      - amazonlinux-2-3003-1-py3
      - oraclelinux-8-3003-1-py3
      - oraclelinux-7-3003-1-py3
      - debian-11-3002-6-py3
      - debian-10-3002-6-py3
      - debian-9-3002-6-py3
      - ubuntu-2004-3002-6-py3
      - ubuntu-1804-3002-6-py3
      - centos-8-3002-6-py3
      - centos-7-3002-6-py3
      - fedora-34-3002-6-py3
      - fedora-33-3002-6-py3
      - amazonlinux-2-3002-6-py3
      - oraclelinux-8-3002-6-py3
      - oraclelinux-7-3002-6-py3
      - opensuse-leap-153-3002-2-py3
      - opensuse-leap-152-3002-2-py3
      - debian-10-3001-7-py3
      - debian-9-3001-7-py3
      - ubuntu-2004-3001-7-py3
      - ubuntu-1804-3001-7-py3
      - centos-8-3001-7-py3
      - centos-7-3001-7-py3
      - fedora-34-3001-7-py3
      - fedora-33-3001-7-py3
      - opensuse-leap-153-3001-7-py3
      - opensuse-leap-152-3001-7-py3
      - amazonlinux-2-3001-7-py3
      - oraclelinux-8-3001-7-py3
      - oraclelinux-7-3001-7-py3
      - debian-10-3000-9-py3
      - debian-9-3000-9-py3
      - ubuntu-1804-3000-9-py3
      - centos-8-3000-9-py3
      - centos-7-3000-9-py3
      - opensuse-leap-153-3000-9-py3
      - opensuse-leap-152-3000-9-py3
      - amazonlinux-2-3000-9-py3
      - oraclelinux-8-3000-9-py3
      - oraclelinux-7-3000-9-py3
      - ubuntu-1804-3000-9-py2
    provisioner:
      state_top:
        base:
          '*':
            - postgres._mapdata
            - postgres
      pillars:
        top.sls:
          base:
            '*':
              - postgres
              - repo
      pillars_from_files:
        postgres.sls: test/salt/pillar/postgres.sls
        repo.sls: test/salt/pillar/repo.sls
    verifier:
      inspec_tests:
        - path: test/integration/repo
--- a/pillar.example
+++ b/pillar.example
@@ -10,7 +10,7 @@ postgres:
  # Set true to configure upstream postgresql.org repository for YUM/APT/ZYPP
  use_upstream_repo: false
  # Version to install from upstream repository (if upstream_repo: true)
-  version: '10'
+  version: '13'
  # Set true to add a file in /etc/profile.d adding the bin dir in $PATH
  # as packages from upstream put them somewhere like /usr/pgsql-10/bin
  add_profile: false
@@ -76,12 +76,15 @@ postgres:
  # The uppercase items must be replaced by actual values.
  # METHOD could be omitted, 'md5' will be appended by default.
  #
  # Postgres expect a valid CIDR for ADDRESS (not ipaddress)
  #
  # If ``acls`` item value is empty ('', [], null), then the contents of
  # ``pg_hba.conf`` file will not be touched at all.
  acls:
    - ['local', 'db0', 'connuser', 'peer map=users_as_appuser']
    - ['local', 'db1', 'localUser']
    - ['host', 'db2', 'remoteUser', '192.168.33.0/24']
    - ['host', 'all', 'all', '127.0.0.1/32', 'md5']
  identity_map:
    - ['users_as_appuser', 'jdoe', 'connuser']
--- a/postgres/_mapdata/_mapdata.jinja
+++ b/postgres/_mapdata/_mapdata.jinja
@@ -0,0 +1,13 @@
 # yamllint disable rule:indentation rule:line-length
 # {{ grains.get("osfinger", grains.os) }}
 ---
 {#- use salt.slsutil.serialize to avoid encoding errors on some platforms #}
 {{ salt["slsutil.serialize"](
     "yaml",
     map,
     default_flow_style=False,
     allow_unicode=True,
   )
   | regex_replace("^\s+'$", "'", multiline=True)
   | trim
 }}
--- a/postgres/_mapdata/init.sls
+++ b/postgres/_mapdata/init.sls
@@ -0,0 +1,22 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 ---
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
 {%- from tplroot ~ "/map.jinja" import postgres with context %}
 {%- set _mapdata = {
      "values": postgres,
    } %}
 {%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
 {%- set output_dir = "/temp" if grains.os_family == "Windows" else "/tmp" %}
 {%- set output_file = output_dir ~ "/salt_mapdata_dump.yaml" %}
 {{ tplroot }}-mapdata-dump:
  file.managed:
    - name: {{ output_file }}
    - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja
    - template: jinja
    - context:
        map: {{ _mapdata | yaml }}
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -60,12 +60,14 @@
 {{ debian_codename('jessie', '9.4') }}
 {{ debian_codename('stretch', '9.6') }}
 {{ debian_codename('buster', '11') }}
 {{ debian_codename('bullseye', '13') }}
 # `oscodename` grain has long distro name
 # if `lsb-release` package not installed
 {{ debian_codename('jessie', '9.4', 'Debian GNU/Linux 8 (jessie)') }}
 {{ debian_codename('stretch', '9.6', 'Debian GNU/Linux 9 (stretch)') }}
 {{ debian_codename('buster', '11', 'Debian GNU/Linux 10 (buster)') }}
 {{ debian_codename('bullseye', '13', 'Debian GNU/Linux 11 (bullseye)') }}
 ## Ubuntu
 # http://apt.postgresql.org/pub/repos/apt/dists/
@@ -76,10 +78,17 @@
 {{ debian_codename('focal', '12') }}
 ## Fedora
-# http://apt.postgresql.org/pub/repos/yum/reporpms/
+# https://download.postgresql.org/pub/repos/yum/13/fedora/
 # https://apps.fedoraproject.org/packages/postgresql
-# `oscodename` grain has long distro name
+{{ fedora_codename('Fedora-34', '13') }}
-{{ fedora_codename('Fedora-31', '11', 'Fedora 31 (Thirty One)') }}
+{{ fedora_codename('Fedora-33', '13') }}
-{{ fedora_codename('Fedora-30', '11', 'Fedora 30 (Thirty)') }}
+
 ## Amazon
 Amazon Linux 2:
  pkgs_deps:
    - libicu
    - systemd-sysv
  pkg_repo:
    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-7-$basearch'
 # vim: ft=sls
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -6,7 +6,7 @@
 postgres:
  use_upstream_repo: true
  add_profile: false  # add bin_dir to $PATH, if installed from repos
-  version: '11'
+  version: '13'
  pkg: postgresql
  pkgs_extra: []
  pkgs_deps: []
--- a/postgres/osfamilymap.yaml
+++ b/postgres/osfamilymap.yaml
@@ -63,11 +63,12 @@ RedHat:
    gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch'
 {%- if grains.get('osmajorrelease', 0) >= 7 %}
  pkgs_deps:
    - libicu
    {%- if grains.get('osmajorrelease', 0) == 7 %}
    - systemd-sysv
    {%- endif %}
  pkg_python: python3-psycopg2
 {%- endif %}
 {% if repo.use_upstream_repo == true %}
  {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}
--- a/postgres/server/remove.sls
+++ b/postgres/server/remove.sls
@@ -24,6 +24,9 @@ postgresql-server-removed:
      - {{ pkg }}
      {% endfor %}
      {% endif %}
  file.absent:
    - names:
      - /var/run/postgresql
 {%- if postgres.remove.multiple_releases %}
    #search for and cleandown multiple releases
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -20,7 +20,7 @@ postgresql-profile:
 postgresql-pkg-deps:
  pkg.installed:
-    - pkgs: {{ postgres.pkgs_deps }}
+    - pkgs: {{ postgres.pkgs_deps | json }}
 # Add upstream repository for your distro
 postgresql-repo:
--- a/test/integration/default/controls/services.rb
+++ b/test/integration/default/controls/services.rb
@@ -0,0 +1,26 @@
 # frozen_string_literal: true
 service_name = 'postgresql'
 pg_port =
  case platform[:family]
  when 'debian', 'suse'
    5433
  else
    5432
  end
 control 'Postgres service' do
  impact 0.5
  title 'should be installed, enabled and running'
  describe service(service_name) do
    it { should be_installed }
    it { should be_enabled }
    it { should be_running }
  end
  describe port(pg_port) do
    it { should be_listening }
  end
 end
--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services_spec.rb
@@ -1,24 +0,0 @@
 # frozen_string_literal: true
 # Overide by Platform
 service_name = 'postgresql'
 pg_port = 5432
 if (platform[:name] == 'centos') && platform[:release].start_with?('6')
  service_name = 'postgresql-9.6'
 elsif (platform[:family] == 'debian') || (platform[:family] == 'suse')
  pg_port = 5433
 end
 control 'Postgres service' do
  impact 0.5
  title 'should be running and enabled'
  describe service(service_name) do
    it { should be_enabled }
    it { should be_running }
  end
  describe port(pg_port) do
    it { should be_listening }
  end
 end
--- a/test/integration/default/controls/share.rb
+++ b/test/integration/default/controls/share.rb
@@ -0,0 +1,13 @@
 # frozen_string_literal: true
 # https://docs.chef.io/inspec/profiles/#including-all-controls-from-a-profile
 # Could use `include_controls` in this scenario
 # include_controls 'share'
 # https://docs.chef.io/inspec/profiles/#selectively-including-controls-from-a-profile
 # However, using `require_controls` for more clarity
 require_controls 'share' do
  control 'Postgres command'
  control 'Postgres configuration'
  # control 'Postgres service'
 end
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -6,6 +6,9 @@ title: postgres formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
 summary: Verify that the postgres formula is setup and configured correctly
 depends:
  - name: share
    path: test/integration/share
 supports:
  - platform-name: debian
  - platform-name: ubuntu
@@ -14,8 +17,11 @@ supports:
  - platform-name: opensuse
  - platform-name: suse
  - platform-name: freebsd
  - platform-name: openbsd
  - platform-name: amazon
  - platform-name: oracle
  - platform-name: arch
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
  - platform: windows
--- a/test/integration/repo/README.md
+++ b/test/integration/repo/README.md
@@ -0,0 +1,50 @@
 # InSpec Profile: `repo`
 This shows the implementation of the `repo` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
 ## Verify a profile
 InSpec ships with built-in features to verify a profile structure.
 ```bash
 $ inspec check repo
 Summary
 -------
 Location: repo
 Profile: profile
 Controls: 4
 Timestamp: 2019-06-24T23:09:01+00:00
 Valid: true
 Errors
 ------
 Warnings
 --------
 ```
 ## Execute a profile
 To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
 ```bash
 $ inspec exec repo
 ..
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)
 8 examples, 0 failures
 ```
 ## Execute a specific control from a profile
 To run one control from the profile use `inspec exec /path/to/profile --controls name`.
 ```bash
 $ inspec exec repo --controls package
 .
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)
 1 examples, 0 failures
 ```
 See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).
--- a/test/integration/repo/controls/services.rb
+++ b/test/integration/repo/controls/services.rb
@@ -0,0 +1,37 @@
 # frozen_string_literal: true
 service_name =
  case platform[:family]
  when 'redhat', 'fedora', 'suse'
    case system.platform[:release]
    when 'tumbleweed'
      'postgresql'
    else
      'postgresql-13'
    end
  else
    'postgresql'
  end
 pg_port =
  case platform[:family]
  when 'debian', 'suse'
    5433
  else
    5432
  end
 control 'Postgres service' do
  impact 0.5
  title 'should be installed, enabled and running'
  describe service(service_name) do
    it { should be_installed }
    it { should be_enabled }
    it { should be_running }
  end
  describe port(pg_port) do
    it { should be_listening }
  end
 end
--- a/test/integration/repo/controls/share.rb
+++ b/test/integration/repo/controls/share.rb
@@ -0,0 +1,13 @@
 # frozen_string_literal: true
 # https://docs.chef.io/inspec/profiles/#including-all-controls-from-a-profile
 # Could use `include_controls` in this scenario
 # include_controls 'share'
 # https://docs.chef.io/inspec/profiles/#selectively-including-controls-from-a-profile
 # However, using `require_controls` for more clarity
 require_controls 'share' do
  control 'Postgres command'
  control 'Postgres configuration'
  # control 'Postgres service'
 end
--- a/test/integration/repo/inspec.yml
+++ b/test/integration/repo/inspec.yml
@@ -0,0 +1,28 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 name: repo
 title: postgres formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
 # yamllint disable-line rule:line-length
 summary: Verify that the postgres formula is setup and configured correctly (when installing from the upstream repo)
 depends:
  - name: share
    path: test/integration/share
 supports:
  - platform-name: debian
  - platform-name: ubuntu
  - platform-name: centos
  - platform-name: fedora
  - platform-name: opensuse
  - platform-name: suse
  - platform-name: freebsd
  - platform-name: openbsd
  - platform-name: amazon
  - platform-name: oracle
  - platform-name: arch
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
  - platform: windows
--- a/test/integration/share/README.md
+++ b/test/integration/share/README.md
@@ -0,0 +1,22 @@
 # InSpec Profile: `share`
 This shows the implementation of the `share` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
 Its goal is to share the libraries between all profiles.
 ## Libraries
 ### `system`
 The `system` library provides easy access to system dependent information:
 - `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective
  - `system.platform[:family]` provide a family name for Arch and Gentoo
  - `system.platform[:name]` append `linux` to both `amazon` and `oracle`; ensure Windows platforms are resolved as simply `windows`
  - `system.platform[:release]` tweak Arch, Amazon Linux, Gentoo, openSUSE and Windows:
    - `Arch` is always `base-latest`
    - `Amazon Linux` release `2018` is resolved as `1`
    - `Gentoo` release is trimmed to its major version number and then the init system is appended (i.e. `sysv` or `sysd`)
    - `openSUSE` is resolved as `tumbleweed` if the `platform[:release]` is in date format
    - `Windows` uses the widely-used release number (e.g. `8.1` or `2019-server`) in place of the actual system release version
  - `system.platform[:finger]` is the concatenation of the name and the major release number (except for Ubuntu, which gives `ubuntu-20.04` for example)
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
--- a/test/integration/default/controls/config_spec.rb
+++ b/test/integration/default/controls/config_spec.rb
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@@ -0,0 +1,24 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
 name: share
 title: InSpec shared resources
 maintainer: SaltStack Formulas
 license: Apache-2.0
 summary: shared resources
 supports:
  - platform-name: debian
  - platform-name: ubuntu
  - platform-name: centos
  - platform-name: fedora
  - platform-name: opensuse
  - platform-name: suse
  - platform-name: freebsd
  - platform-name: openbsd
  - platform-name: amazon
  - platform-name: oracle
  - platform-name: arch
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
  - platform: windows
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@@ -0,0 +1,90 @@
 # frozen_string_literal: true
 # system.rb -- InSpec resources for system values
 # Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
 # Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
 class SystemResource < Inspec.resource(1)
  name 'system'
  attr_reader :platform
  def initialize
    super
    @platform = build_platform
  end
  private
  def build_platform
    {
      family: build_platform_family,
      name: build_platform_name,
      release: build_platform_release,
      finger: build_platform_finger
    }
  end
  def build_platform_family
    case inspec.platform[:name]
    when 'arch', 'gentoo'
      inspec.platform[:name]
    else
      inspec.platform[:family]
    end
  end
  def build_platform_name
    case inspec.platform[:name]
    when 'amazon', 'oracle', 'rocky'
      "#{inspec.platform[:name]}linux"
    when /^windows_/
      inspec.platform[:family]
    else
      inspec.platform[:name]
    end
  end
  # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
  def build_platform_release
    case inspec.platform[:name]
    when 'amazon'
      # `2018` relase is named `1` in kitchen.yaml
      inspec.platform[:release].gsub(/2018.*/, '1')
    when 'arch'
      'base-latest'
    when 'gentoo'
      "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
    when 'opensuse'
      # rubocop:disable Style/NumericLiterals,Layout/LineLength
      inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
      # rubocop:enable Style/NumericLiterals,Layout/LineLength
    when 'windows_8.1_pro'
      '8.1'
    when 'windows_server_2019_datacenter'
      '2019-server'
    when 'windows_server_2016_datacenter'
      '2016-server'
    else
      inspec.platform[:release]
    end
  end
  # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
  def derive_gentoo_init_system
    inspec.command('systemctl').exist? ? 'sysd' : 'sysv'
  end
  def build_platform_finger
    "#{build_platform_name}-#{build_finger_release}"
  end
  def build_finger_release
    case inspec.platform[:name]
    when 'ubuntu'
      build_platform_release.split('.').slice(0, 2).join('.')
    else
      build_platform_release.split('.')[0]
    end
  end
 end
--- a/test/salt/pillar/postgres.sls
+++ b/test/salt/pillar/postgres.sls
@@ -8,25 +8,7 @@ postgres.port: '5433'
 {%- endif %}
 postgres:
-  # UPSTREAM REPO
+  use_upstream_repo: false
  # Set True to configure upstream postgresql.org repository for YUM/APT/ZYPP
  {%- if grains.os_family != 'Debian' and salt['grains.get']('osfinger') != 'CentOS-6' %}
  use_upstream_repo: False
  {%- else %}
  use_upstream_repo: True
  # Version to install from upstream repository (if upstream_repo: True)
  {%- if not (grains.os_family == 'Debian') %}
  version: '9.6'
  {%- else %}
  version: '10'
  {%- endif %}
  # # Set True to add a file in /etc/profile.d adding the bin dir in $PATH
  # # as packages from upstream put them somewhere like /usr/pgsql-10/bin
  # add_profile: False
  # # If automatic package installation fails, use `fromrepo` to specify the
  # # upstream repo to install packages from [#133, #185] (if upstream_repo: True)
  # fromrepo: 'jessie-pgdg'
  {%- endif %}
  # ### MACOS
  # # Set to 'postgresapp' OR 'homebrew' for MacOS
@@ -181,7 +163,8 @@ postgres:
        public:
          owner: localUser
      # enable per-db extension
-      {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
+      {#- TODO: Find a way to only disable this for the `default` suite, since it works with the `repo` suite #}
      {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-9' %}
      extensions:
        uuid-ossp:
          schema: 'public'
@@ -194,7 +177,8 @@ postgres:
      owner: localUser
  # optional extensions to install in schema
-  {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
+  {#- TODO: Find a way to only disable this for the `default` suite, since it works with the `repo` suite #}
  {%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-9' %}
  extensions:
    uuid-ossp:
      schema: uuid-ossp
--- a/test/salt/pillar/repo.sls
+++ b/test/salt/pillar/repo.sls
@@ -0,0 +1,4 @@
 ---
 postgres:
  use_upstream_repo: true
  version: '13'
Author	SHA1	Message	Date
semantic-release-bot	47ada685df	chore(release): 0.43.0 [skip ci] # [0.43.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.42.0...v0.43.0) (2021-07-20) ### Bug Fixes * redhat: fix `pkg_deps` to be able to install PostgreSQL 13 ([`060c8df`](`060c8df630`)) ### Continuous Integration * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([`1fa7c66`](`1fa7c66b83`)) * use `default` & `repo` InSpec suites ([`a6c8197`](`a6c81972a2`)) * kitchen: move `provisioner` block & update `run_command` [skip ci] ([`e9da40b`](`e9da40b570`)) ### Features * codenamemap: update to current supported Fedora versions ([`8a11bd6`](`8a11bd679a`)) ### Tests * inspec: move common controls to the `share` profile ([`2214096`](`2214096362`)) * inspec: rename all files to avoid unnecessary `_spec` suffix ([`a1837c2`](`a1837c24f1`)) * pillar: use separate pillars to test `default` & `repo` suites ([`27473b9`](`27473b9865`))	2021-07-20 18:42:59 +00:00
Imran Iqbal	18d3df43ad	Merge pull request #315 from myii/feat/update-all-platforms-for-postgresql-13-inc-CI feat: update all platforms for PostgreSQL 13 (inc. `use_upstream_repo` in CI)	2021-07-20 19:34:57 +01:00
Imran Iqbal	a1837c24f1	test(inspec): rename all files to avoid unnecessary `_spec` suffix	2021-07-20 19:22:36 +01:00
Imran Iqbal	2214096362	test(inspec): move common controls to the `share` profile	2021-07-20 19:21:29 +01:00
Imran Iqbal	27473b9865	test(pillar): use separate pillars to test `default` & `repo` suites	2021-07-20 18:31:04 +01:00
Imran Iqbal	a6c81972a2	ci: use `default` & `repo` InSpec suites * Automated using https://github.com/myii/ssf-formula/pull/348	2021-07-20 18:02:47 +01:00
Imran Iqbal	060c8df630	fix(redhat): fix `pkg_deps` to be able to install PostgreSQL 13	2021-07-20 16:25:49 +01:00
Imran Iqbal	8a11bd679a	feat(codenamemap): update to current supported Fedora versions	2021-07-20 16:24:58 +01:00
Imran Iqbal	1fa7c66b83	ci: add Debian 11 Bullseye & update `yamllint` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/345	2021-07-18 19:04:07 +01:00
Imran Iqbal	e9da40b570	ci(kitchen): move `provisioner` block & update `run_command` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/344	2021-07-17 21:11:44 +01:00
Imran Iqbal	24f92dd0ef	chore(gemfile+lock): update to latest gem versions (2021-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/343	2021-07-17 20:29:02 +01:00
semantic-release-bot	f6bab93f27	chore(release): 0.42.0 [skip ci] # [0.42.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.9...v0.42.0) (2021-07-15) ### Features * debian: add bullseye support ([`216192d`](`216192dece`))	2021-07-15 09:09:24 +00:00
Imran Iqbal	d2efe082db	Merge pull request #319 from droope/master feat(debian): add bullseye support	2021-07-15 10:03:32 +01:00
Imran Iqbal	fa14f63a0a	chore(deps): bump `addressable` from `2.7.0` to `2.8.0` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/340	2021-07-14 12:15:30 +01:00
Pedro Worcel	216192dece	feat(debian): add bullseye support	2021-07-13 10:15:04 +12:00
semantic-release-bot	f9b6f36f2b	chore(release): 0.41.9 [skip ci] ## [0.41.9](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.8...v0.41.9) (2021-07-06) ### Bug Fixes * osmap.yaml: fix PGDG repo file creation for Amazon Linux ([`2de775b`](`2de775be1e`)) ### Continuous Integration * 3003.1: update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([`d16e91c`](`d16e91ceb0`)) * kitchen+gitlab: remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([`b690bab`](`b690bab978`))	2021-07-06 14:04:32 +00:00
Imran Iqbal	097d4e4bcf	Merge pull request #314 from Niyakiy/dev/fix-amazon-linux-install-from-upstream-repo fix(osmap.yaml): fix PGDG repo file creation for Amazon Linux 2	2021-07-06 14:58:31 +01:00
Eugene Chepurniy	2de775be1e	fix(osmap.yaml): fix PGDG repo file creation for Amazon Linux	2021-07-06 15:11:56 +03:00
Imran Iqbal	d16e91ceb0	ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/335	2021-07-02 00:06:32 +01:00
Imran Iqbal	b690bab978	ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/331	2021-06-21 20:47:30 +01:00
Imran Iqbal	288bea8fac	Merge pull request #313 from noelmcloughlin/clena chore(version): increase default version; remove pid dir on clean; update pillar.example	2021-06-14 13:23:05 +01:00
noelmcloughlin	92e0ad383c	chore(version): bump to modern version	2021-06-09 21:43:13 +01:00
noelmcloughlin	9e145be0ed	chore(clean): remove directory after pkg remove	2021-06-06 21:12:30 +01:00
semantic-release-bot	1d34f8c56f	chore(release): 0.41.8 [skip ci] ## [0.41.8](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.7...v0.41.8) (2021-05-25) ### Bug Fixes * jinja: use json filter ([`eb63ec8`](`eb63ec85e0`)) ### Continuous Integration * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([`79feefa`](`79feefa751`)) * kitchen+gitlab: adjust matrix to add `3003` [skip ci] ([`fd8f0e5`](`fd8f0e5db5`)) * vagrant: add FreeBSD 13.0 [skip ci] ([`93bb123`](`93bb123ea1`)) * vagrant: use pre-salted boxes & conditional local settings [skip ci] ([`69812c1`](`69812c1f62`)) ### Documentation * readme: fix headings [skip ci] ([`c97317c`](`c97317c39f`))	2021-05-25 08:38:31 +00:00
N	45cc47d9f8	Merge pull request #312 from noelmcloughlin/centos fix(jinja): use json filter	2021-05-25 09:32:37 +01:00
noelmcloughlin	eb63ec85e0	fix(jinja): use json filter	2021-05-20 16:56:08 +01:00
Imran Iqbal	809aaabdbc	chore(pre-commit): use `info` report level for `rstcheck` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/325	2021-05-20 14:09:47 +01:00
Imran Iqbal	79feefa751	ci: add `arch-master` to matrix and update `.travis.yml` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/323	2021-05-09 22:32:58 +01:00
Imran Iqbal	c97317c39f	docs(readme): fix headings [skip ci]	2021-05-05 15:16:30 +01:00
Imran Iqbal	fd8f0e5db5	ci(kitchen+gitlab): adjust matrix to add `3003` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/318	2021-04-23 08:48:44 +01:00
Imran Iqbal	93bb123ea1	ci(vagrant): add FreeBSD 13.0 [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/316	2021-04-20 00:25:25 +01:00
Imran Iqbal	69812c1f62	ci(vagrant): use pre-salted boxes & conditional local settings [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/311	2021-04-05 18:54:52 +01:00
Imran Iqbal	42bb7f8cb8	chore: update `CODEOWNERS` & `.yamllint` re: `kitchen-vagrant` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/310	2021-04-05 18:21:03 +01:00
semantic-release-bot	01141d1116	chore(release): 0.41.7 [skip ci] ## [0.41.7](https://github.com/saltstack-formulas/postgres-formula/compare/v0.41.6...v0.41.7) (2021-03-26) ### Continuous Integration * enable Vagrant-based testing using GitHub Actions ([`2ebc9c1`](`2ebc9c11da`)) * kitchen+ci: use latest pre-salted images (after CVE) [skip ci] ([`cc43d1c`](`cc43d1c90d`)) ### Documentation * readme: add `Testing with Vagrant` section ([`ed2d688`](`ed2d6884b1`)) ### Tests * standardise use of `share` suite & `_mapdata` state [skip ci] ([`fc53d97`](`fc53d977b3`))	2021-03-26 16:44:28 +00:00
Imran Iqbal	0ee210c25f	Merge pull request #310 from myii/ci/add-vagrant-testing-via-github-actions ci: enable Vagrant-based testing using GitHub Actions	2021-03-26 16:35:51 +00:00
Imran Iqbal	ed2d6884b1	docs(readme): add `Testing with Vagrant` section	2021-03-26 14:59:24 +00:00
Imran Iqbal	2ebc9c11da	ci: enable Vagrant-based testing using GitHub Actions * Semi-automated using https://github.com/myii/ssf-formula/pull/304	2021-03-26 11:26:19 +00:00
Imran Iqbal	fc53d977b3	test: standardise use of `share` suite & `_mapdata` state [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/302	2021-03-23 21:31:59 +00:00
Imran Iqbal	cc43d1c90d	ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/299	2021-03-07 22:21:34 +00:00
Imran Iqbal	23b1f18dba	chore(yamllint): add `.git/` to ignores [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/297	2021-03-05 18:34:31 +00:00