From 98c9dbfcfbb45f514a7d35165f1ac572c0bfe6af Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 17 Nov 2021 21:53:16 +0000 Subject: [PATCH 1/3] ci: use `pillars_from_directories` & `test/salt/pillar/top.sls` * Automated using https://github.com/myii/ssf-formula/pull/384 --- .github/workflows/kitchen.vagrant.yml | 14 +- .github/workflows/kitchen.windows.yml | 4 +- .gitlab-ci.yml | 126 ++++-- .travis.yml | 126 ++++-- CODEOWNERS | 1 + kitchen.vagrant.yml | 24 ++ kitchen.windows.yml | 6 + kitchen.yml | 366 +++++++++++++----- test/integration/default/README.md | 50 +++ test/integration/default/controls/_mapdata.rb | 47 +++ test/integration/default/inspec.yml | 27 ++ test/salt/pillar/top.sls | 13 + 12 files changed, 612 insertions(+), 192 deletions(-) create mode 100644 test/integration/default/README.md create mode 100644 test/integration/default/controls/_mapdata.rb create mode 100644 test/integration/default/inspec.yml create mode 100644 test/salt/pillar/top.sls diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index ae72645..ccb2537 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -14,12 +14,14 @@ jobs: fail-fast: false matrix: instance: - - v3003-py3-freebsd-130-3003-1-py3 - - v3003-py3-freebsd-122-3003-1-py3 - - v3002-py3-openbsd-69-3002-6-py3 - - v3001-py3-openbsd-68-3001-1-py3 - - v3003-py3-windows-10-latest-py3 - - v3003-py3-windows-81-latest-py3 + # - default-freebsd-130-master-py3 + # - default-freebsd-122-master-py3 + - default-freebsd-130-3003-1-py3 + - default-freebsd-122-3003-1-py3 + - default-openbsd-69-3002-6-py3 + # - default-openbsd-68-3001-1-py3 + - default-windows-10-latest-py3 + - default-windows-81-latest-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml index d49f492..0690622 100644 --- a/.github/workflows/kitchen.windows.yml +++ b/.github/workflows/kitchen.windows.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: instance: - - v3003-py3-windows-2019-latest-py3 + - default-windows-2019-latest-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' @@ -61,7 +61,7 @@ jobs: fail-fast: false matrix: instance: - - v3003-py3-windows-2016-latest-py3 + - default-windows-2016-latest-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7dd9f5..b14235f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,46 +130,92 @@ rubocop: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` -v3003-py3-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'} -# v3003-py3-debian-10-3003-3-py3: {extends: '.test_instance'} -# v3003-py3-debian-9-3003-3-py3: {extends: '.test_instance'} -v3003-py3-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} -# v3003-py3-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} -v3003-py3-centos-8-3003-3-py3: {extends: '.test_instance'} -# v3003-py3-centos-7-3003-3-py3: {extends: '.test_instance'} -v3003-py3-fedora-34-3003-3-py3: {extends: '.test_instance'} -v3003-py3-fedora-33-3003-3-py3: {extends: '.test_instance'} -v3003-py3-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} -# v3003-py3-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} -# v3003-py3-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} -v3003-py3-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} -v3003-py3-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} -# v3003-py3-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} -v3003-py3-arch-base-latest-3003-3-py3: {extends: '.test_instance'} -v3003-py3-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'} -v3003-py3-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'} -v3003-py3-almalinux-8-3003-3-py3: {extends: '.test_instance'} -# v3002-py3-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'} -v3002-py3-debian-10-3002-7-py3: {extends: '.test_instance'} -# v3002-py3-debian-9-3002-7-py3: {extends: '.test_instance'} -v3002-py3-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} -# v3002-py3-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} -v3002-py3-centos-8-3002-7-py3: {extends: '.test_instance'} -# v3002-py3-centos-7-3002-7-py3: {extends: '.test_instance'} -# v3002-py3-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} -v3002-py3-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} -# v3002-py3-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} -# v3002-py3-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} -# v3002-py3-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} -# v3001-py3-debian-10-3001-8-py3: {extends: '.test_instance'} -v3001-py3-debian-9-3001-8-py3: {extends: '.test_instance'} -# v3001-py3-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} -v3001-py3-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} -# v3001-py3-centos-8-3001-8-py3: {extends: '.test_instance'} -v3001-py3-centos-7-3001-8-py3: {extends: '.test_instance'} -# v3001-py3-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} -# v3001-py3-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} -v3001-py3-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} +# 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-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-almalinux-8-tiamat-py3: {extends: '.test_instance'} +# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} +# default-debian-11-master-py3: {extends: '.test_instance'} +# default-debian-10-master-py3: {extends: '.test_instance'} +# default-debian-9-master-py3: {extends: '.test_instance'} +# default-ubuntu-2004-master-py3: {extends: '.test_instance'} +# default-ubuntu-1804-master-py3: {extends: '.test_instance'} +# default-centos-8-master-py3: {extends: '.test_instance'} +# default-centos-7-master-py3: {extends: '.test_instance'} +# default-fedora-34-master-py3: {extends: '.test_instance'} +# default-fedora-33-master-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-master-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-master-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +# default-amazonlinux-2-master-py3: {extends: '.test_instance'} +# default-oraclelinux-8-master-py3: {extends: '.test_instance'} +# default-oraclelinux-7-master-py3: {extends: '.test_instance'} +# default-arch-base-latest-master-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} +# default-almalinux-8-master-py3: {extends: '.test_instance'} +# default-rockylinux-8-master-py3: {extends: '.test_instance'} +default-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'} +# default-debian-10-3003-3-py3: {extends: '.test_instance'} +# default-debian-9-3003-3-py3: {extends: '.test_instance'} +default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +default-centos-8-3003-3-py3: {extends: '.test_instance'} +# default-centos-7-3003-3-py3: {extends: '.test_instance'} +default-fedora-34-3003-3-py3: {extends: '.test_instance'} +default-fedora-33-3003-3-py3: {extends: '.test_instance'} +default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} +default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} +default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'} +default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'} +default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'} +default-almalinux-8-3003-3-py3: {extends: '.test_instance'} +# default-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'} +default-debian-10-3002-7-py3: {extends: '.test_instance'} +# default-debian-9-3002-7-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} +default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# default-centos-8-3002-7-py3: {extends: '.test_instance'} +default-centos-7-3002-7-py3: {extends: '.test_instance'} +# default-fedora-34-3002-7-py3: {extends: '.test_instance'} +# default-fedora-33-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} +default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} +# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3001-8-py3: {extends: '.test_instance'} +default-debian-9-3001-8-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} +# default-centos-8-3001-8-py3: {extends: '.test_instance'} +# default-centos-7-3001-8-py3: {extends: '.test_instance'} +# default-fedora-34-3001-8-py3: {extends: '.test_instance'} +# default-fedora-33-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} +# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 0d00c2f..44ade7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,46 +83,92 @@ jobs: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - - env: INSTANCE=v3003-py3-debian-11-3003-3-py3 - # - env: INSTANCE=v3003-py3-debian-10-3003-3-py3 - # - env: INSTANCE=v3003-py3-debian-9-3003-3-py3 - - env: INSTANCE=v3003-py3-ubuntu-2004-3003-3-py3 - # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-3-py3 - - env: INSTANCE=v3003-py3-centos-8-3003-3-py3 - # - env: INSTANCE=v3003-py3-centos-7-3003-3-py3 - - env: INSTANCE=v3003-py3-fedora-34-3003-3-py3 - - env: INSTANCE=v3003-py3-fedora-33-3003-3-py3 - - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-3-py3 - # - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-3-py3 - # - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-3-py3 - - env: INSTANCE=v3003-py3-amazonlinux-2-3003-3-py3 - - env: INSTANCE=v3003-py3-oraclelinux-8-3003-3-py3 - # - env: INSTANCE=v3003-py3-oraclelinux-7-3003-3-py3 - - env: INSTANCE=v3003-py3-arch-base-latest-3003-3-py3 - - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-3-py3 - - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-3-py3 - - env: INSTANCE=v3003-py3-almalinux-8-3003-3-py3 - # - env: INSTANCE=v3002-py3-debian-11-3002-7-py3 - - env: INSTANCE=v3002-py3-debian-10-3002-7-py3 - # - env: INSTANCE=v3002-py3-debian-9-3002-7-py3 - - env: INSTANCE=v3002-py3-ubuntu-2004-3002-7-py3 - # - env: INSTANCE=v3002-py3-ubuntu-1804-3002-7-py3 - - env: INSTANCE=v3002-py3-centos-8-3002-7-py3 - # - env: INSTANCE=v3002-py3-centos-7-3002-7-py3 - # - env: INSTANCE=v3002-py3-amazonlinux-2-3002-7-py3 - - env: INSTANCE=v3002-py3-oraclelinux-8-3002-7-py3 - # - env: INSTANCE=v3002-py3-oraclelinux-7-3002-7-py3 - # - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-7-py3 - # - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-7-py3 - # - env: INSTANCE=v3001-py3-debian-10-3001-8-py3 - - env: INSTANCE=v3001-py3-debian-9-3001-8-py3 - # - env: INSTANCE=v3001-py3-ubuntu-2004-3001-8-py3 - - env: INSTANCE=v3001-py3-ubuntu-1804-3001-8-py3 - # - env: INSTANCE=v3001-py3-centos-8-3001-8-py3 - - env: INSTANCE=v3001-py3-centos-7-3001-8-py3 - # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-8-py3 - # - env: INSTANCE=v3001-py3-oraclelinux-8-3001-8-py3 - - env: INSTANCE=v3001-py3-oraclelinux-7-3001-8-py3 + # - 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-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-almalinux-8-tiamat-py3 + # - env: INSTANCE=default-rockylinux-8-tiamat-py3 + # - env: INSTANCE=default-debian-11-master-py3 + # - env: INSTANCE=default-debian-10-master-py3 + # - env: INSTANCE=default-debian-9-master-py3 + # - env: INSTANCE=default-ubuntu-2004-master-py3 + # - env: INSTANCE=default-ubuntu-1804-master-py3 + # - env: INSTANCE=default-centos-8-master-py3 + # - env: INSTANCE=default-centos-7-master-py3 + # - env: INSTANCE=default-fedora-34-master-py3 + # - env: INSTANCE=default-fedora-33-master-py3 + # - env: INSTANCE=default-opensuse-leap-153-master-py3 + # - env: INSTANCE=default-opensuse-leap-152-master-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 + # - env: INSTANCE=default-amazonlinux-2-master-py3 + # - env: INSTANCE=default-oraclelinux-8-master-py3 + # - env: INSTANCE=default-oraclelinux-7-master-py3 + # - env: INSTANCE=default-arch-base-latest-master-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-master-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 + # - env: INSTANCE=default-almalinux-8-master-py3 + # - env: INSTANCE=default-rockylinux-8-master-py3 + - env: INSTANCE=default-debian-11-3003-3-py3 + # - env: INSTANCE=default-debian-10-3003-3-py3 + # - env: INSTANCE=default-debian-9-3003-3-py3 + - env: INSTANCE=default-ubuntu-2004-3003-3-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-3-py3 + - env: INSTANCE=default-centos-8-3003-3-py3 + # - env: INSTANCE=default-centos-7-3003-3-py3 + - env: INSTANCE=default-fedora-34-3003-3-py3 + - env: INSTANCE=default-fedora-33-3003-3-py3 + - env: INSTANCE=default-opensuse-leap-153-3003-3-py3 + # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3 + - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3 + - env: INSTANCE=default-amazonlinux-2-3003-3-py3 + - env: INSTANCE=default-oraclelinux-8-3003-3-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-3-py3 + # - env: INSTANCE=default-arch-base-latest-3003-3-py3 + - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3 + - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3 + - env: INSTANCE=default-almalinux-8-3003-3-py3 + # - env: INSTANCE=default-debian-11-3002-7-py3 + - env: INSTANCE=default-debian-10-3002-7-py3 + # - env: INSTANCE=default-debian-9-3002-7-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-7-py3 + - env: INSTANCE=default-ubuntu-1804-3002-7-py3 + # - env: INSTANCE=default-centos-8-3002-7-py3 + - env: INSTANCE=default-centos-7-3002-7-py3 + # - env: INSTANCE=default-fedora-34-3002-7-py3 + # - env: INSTANCE=default-fedora-33-3002-7-py3 + # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3 + # - env: INSTANCE=default-opensuse-leap-152-3002-7-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3 + # - env: INSTANCE=default-amazonlinux-2-3002-7-py3 + # - env: INSTANCE=default-oraclelinux-8-3002-7-py3 + - env: INSTANCE=default-oraclelinux-7-3002-7-py3 + # - env: INSTANCE=default-arch-base-latest-3002-7-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3 + # - env: INSTANCE=default-debian-10-3001-8-py3 + - env: INSTANCE=default-debian-9-3001-8-py3 + # - env: INSTANCE=default-ubuntu-2004-3001-8-py3 + # - env: INSTANCE=default-ubuntu-1804-3001-8-py3 + # - env: INSTANCE=default-centos-8-3001-8-py3 + # - env: INSTANCE=default-centos-7-3001-8-py3 + # - env: INSTANCE=default-fedora-34-3001-8-py3 + # - env: INSTANCE=default-fedora-33-3001-8-py3 + # - env: INSTANCE=default-opensuse-leap-153-3001-8-py3 + # - env: INSTANCE=default-opensuse-leap-152-3001-8-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3 + # - env: INSTANCE=default-amazonlinux-2-3001-8-py3 + # - env: INSTANCE=default-oraclelinux-8-3001-8-py3 + # - env: INSTANCE=default-oraclelinux-7-3001-8-py3 + # - env: INSTANCE=default-arch-base-latest-3001-8-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/CODEOWNERS b/CODEOWNERS index 1639fa2..4a0be61 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -23,6 +23,7 @@ /test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf +/test/salt/pillar/top.sls @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf /.cirrus.yml @saltstack-formulas/ssf /.gitlab-ci.yml @saltstack-formulas/ssf diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index bde6281..849eda6 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -22,28 +22,46 @@ platforms: driver: box: myii/freebsd-13.0-master-py3 synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 + verifier: + inputs: + saltmajorversion: 3004 - name: freebsd-122-master-py3 driver: box: myii/freebsd-12.2-master-py3 + verifier: + inputs: + saltmajorversion: 3004 - name: freebsd-130-3003-1-py3 driver: box: myii/freebsd-13.0-3003.1-py3 synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 + verifier: + inputs: + saltmajorversion: 3003 - name: freebsd-122-3003-1-py3 driver: box: myii/freebsd-12.2-3003.1-py3 + verifier: + inputs: + saltmajorversion: 3003 - name: openbsd-69-3002-6-py3 driver: box: myii/openbsd-6.9-3002.6-py3 ssh: shell: /bin/ksh synced_folders: [] + verifier: + inputs: + saltmajorversion: 3002 - name: openbsd-68-3001-1-py3 driver: box: myii/openbsd-6.8-3001.1-py3 ssh: shell: /bin/ksh synced_folders: [] + verifier: + inputs: + saltmajorversion: 3001 - name: windows-10-latest-py3 driver: box: techneg/win10x64-pro-salt @@ -65,6 +83,9 @@ platforms: skip_verify=True makedirs=True exit 0 # yamllint enable rule:line-length + verifier: + inputs: + saltmajorversion: 3003 - name: windows-81-latest-py3 driver: box: techneg/win81x64-pro-salt @@ -86,3 +107,6 @@ platforms: skip_verify=True makedirs=True exit 0 # yamllint enable rule:line-length + verifier: + inputs: + saltmajorversion: 3003 diff --git a/kitchen.windows.yml b/kitchen.windows.yml index 8ee1773..712bb86 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -22,4 +22,10 @@ provisioner: platforms: - name: windows-2019-latest-py3 + verifier: + inputs: + saltmajorversion: 3003 - name: windows-2016-latest-py3 + verifier: + inputs: + saltmajorversion: 3003 diff --git a/kitchen.yml b/kitchen.yml index 2328ffa..142355f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -17,6 +17,8 @@ provisioner: salt_copy_filter: - .kitchen - .git + pillars_from_directories: + - test/salt/pillar platforms: ## SALT `tiamat` @@ -24,77 +26,140 @@ platforms: driver: image: saltimages/salt-tiamat-py3:debian-11 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: debian-10-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:debian-10 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: debian-9-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:debian-9 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: ubuntu-2004-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-20.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: ubuntu-1804-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 + verifier: + inputs: + saltmajorversion: 3004 - name: centos-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-7 + verifier: + inputs: + saltmajorversion: 3004 - name: amazonlinux-2-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:amazonlinux-2 + verifier: + inputs: + saltmajorversion: 3004 - name: oraclelinux-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:oraclelinux-8 + verifier: + inputs: + saltmajorversion: 3004 - name: oraclelinux-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:oraclelinux-7 + verifier: + inputs: + saltmajorversion: 3004 - name: almalinux-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:almalinux-8 + verifier: + inputs: + saltmajorversion: 3004 - name: rockylinux-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:rockylinux-8 + verifier: + inputs: + saltmajorversion: 3004 ## SALT `master` - name: debian-11-master-py3 driver: image: saltimages/salt-master-py3:debian-11 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: debian-10-master-py3 driver: image: saltimages/salt-master-py3:debian-10 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: debian-9-master-py3 driver: image: saltimages/salt-master-py3:debian-9 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: ubuntu-2004-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-20.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3004 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 + verifier: + inputs: + saltmajorversion: 3004 - name: centos-7-master-py3 driver: image: saltimages/salt-master-py3:centos-7 + verifier: + inputs: + saltmajorversion: 3004 - name: fedora-34-master-py3 driver: image: saltimages/salt-master-py3:fedora-34 + verifier: + inputs: + saltmajorversion: 3004 - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 + verifier: + inputs: + saltmajorversion: 3004 - name: opensuse-leap-153-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.3 @@ -102,6 +167,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3004 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -109,6 +177,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3004 - name: opensuse-tmbl-latest-master-py3 driver: image: saltimages/salt-master-py3:opensuse-tumbleweed-latest @@ -116,65 +187,119 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3004 - name: amazonlinux-2-master-py3 driver: image: saltimages/salt-master-py3:amazonlinux-2 + verifier: + inputs: + saltmajorversion: 3004 - name: oraclelinux-8-master-py3 driver: image: saltimages/salt-master-py3:oraclelinux-8 + verifier: + inputs: + saltmajorversion: 3004 - name: oraclelinux-7-master-py3 driver: image: saltimages/salt-master-py3:oraclelinux-7 + verifier: + inputs: + saltmajorversion: 3004 - name: arch-base-latest-master-py3 driver: image: saltimages/salt-master-py3:arch-base-latest + verifier: + inputs: + saltmajorversion: 3004 - name: gentoo-stage3-latest-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-latest run_command: /sbin/init + verifier: + inputs: + saltmajorversion: 3004 - name: gentoo-stage3-systemd-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd + verifier: + inputs: + saltmajorversion: 3004 - name: almalinux-8-master-py3 driver: image: saltimages/salt-master-py3:almalinux-8 + verifier: + inputs: + saltmajorversion: 3004 - name: rockylinux-8-master-py3 driver: image: saltimages/salt-master-py3:rockylinux-8 + verifier: + inputs: + saltmajorversion: 3004 ## SALT `3003.3` - name: debian-11-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:debian-11 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3003 - name: debian-10-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:debian-10 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3003 - name: debian-9-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:debian-9 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3003 - name: ubuntu-2004-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:ubuntu-20.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3003 - name: ubuntu-1804-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3003 - name: centos-8-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:centos-8 + verifier: + inputs: + saltmajorversion: 3003 - name: centos-7-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:centos-7 + verifier: + inputs: + saltmajorversion: 3003 - name: fedora-34-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:fedora-34 + verifier: + inputs: + saltmajorversion: 3003 - name: fedora-33-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:fedora-33 + verifier: + inputs: + saltmajorversion: 3003 - name: opensuse-leap-153-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:opensuse-leap-15.3 @@ -182,6 +307,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3003 - name: opensuse-leap-152-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:opensuse-leap-15.2 @@ -189,6 +317,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3003 - name: opensuse-tmbl-latest-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest @@ -196,62 +327,113 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3003 - name: amazonlinux-2-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:amazonlinux-2 + verifier: + inputs: + saltmajorversion: 3003 - name: oraclelinux-8-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:oraclelinux-8 + verifier: + inputs: + saltmajorversion: 3003 - name: oraclelinux-7-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:oraclelinux-7 + verifier: + inputs: + saltmajorversion: 3003 - name: arch-base-latest-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:arch-base-latest + verifier: + inputs: + saltmajorversion: 3003 - name: gentoo-stage3-latest-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:gentoo-stage3-latest run_command: /sbin/init + verifier: + inputs: + saltmajorversion: 3003 - name: gentoo-stage3-systemd-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd + verifier: + inputs: + saltmajorversion: 3003 - name: almalinux-8-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:almalinux-8 + verifier: + inputs: + saltmajorversion: 3003 ## SALT `3002.7` - name: debian-11-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:debian-11 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3002 - name: debian-10-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:debian-10 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3002 - name: debian-9-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:debian-9 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3002 - name: ubuntu-2004-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:ubuntu-20.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3002 - name: ubuntu-1804-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3002 - name: centos-8-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:centos-8 + verifier: + inputs: + saltmajorversion: 3002 - name: centos-7-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:centos-7 + verifier: + inputs: + saltmajorversion: 3002 - name: fedora-34-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:fedora-34 + verifier: + inputs: + saltmajorversion: 3002 - name: fedora-33-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:fedora-33 + verifier: + inputs: + saltmajorversion: 3002 - name: opensuse-leap-153-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:opensuse-leap-15.3 @@ -259,6 +441,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3002 - name: opensuse-leap-152-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:opensuse-leap-15.2 @@ -266,6 +451,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3002 - name: opensuse-tmbl-latest-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest @@ -273,55 +461,100 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3002 - name: amazonlinux-2-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:amazonlinux-2 + verifier: + inputs: + saltmajorversion: 3002 - name: oraclelinux-8-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:oraclelinux-8 + verifier: + inputs: + saltmajorversion: 3002 - name: oraclelinux-7-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:oraclelinux-7 + verifier: + inputs: + saltmajorversion: 3002 - name: arch-base-latest-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:arch-base-latest + verifier: + inputs: + saltmajorversion: 3002 - name: gentoo-stage3-latest-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:gentoo-stage3-latest run_command: /sbin/init + verifier: + inputs: + saltmajorversion: 3002 - name: gentoo-stage3-systemd-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd + verifier: + inputs: + saltmajorversion: 3002 ## SALT `3001.8` - name: debian-10-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:debian-10 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3001 - name: debian-9-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:debian-9 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3001 - name: ubuntu-2004-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3001 - name: ubuntu-1804-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + verifier: + inputs: + saltmajorversion: 3001 - name: centos-8-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:centos-8 + verifier: + inputs: + saltmajorversion: 3001 - name: centos-7-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:centos-7 + verifier: + inputs: + saltmajorversion: 3001 - name: fedora-34-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:fedora-34 + verifier: + inputs: + saltmajorversion: 3001 - name: fedora-33-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:fedora-33 + verifier: + inputs: + saltmajorversion: 3001 - name: opensuse-leap-153-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:opensuse-leap-15.3 @@ -329,6 +562,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3001 - name: opensuse-leap-152-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:opensuse-leap-15.2 @@ -336,6 +572,9 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3001 - name: opensuse-tmbl-latest-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest @@ -343,25 +582,46 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + verifier: + inputs: + saltmajorversion: 3001 - name: amazonlinux-2-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:amazonlinux-2 + verifier: + inputs: + saltmajorversion: 3001 - name: oraclelinux-8-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:oraclelinux-8 + verifier: + inputs: + saltmajorversion: 3001 - name: oraclelinux-7-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:oraclelinux-7 + verifier: + inputs: + saltmajorversion: 3001 - name: arch-base-latest-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:arch-base-latest + verifier: + inputs: + saltmajorversion: 3001 - name: gentoo-stage3-latest-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:gentoo-stage3-latest run_command: /sbin/init + verifier: + inputs: + saltmajorversion: 3001 - name: gentoo-stage3-systemd-3001-8-py3 driver: image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd + verifier: + inputs: + saltmajorversion: 3001 verifier: # https://www.inspec.io/ @@ -372,33 +632,7 @@ verifier: - cli suites: - - name: v3003-py3 - includes: - - debian-11-3003-3-py3 - - debian-10-3003-3-py3 - - debian-9-3003-3-py3 - - ubuntu-2004-3003-3-py3 - - ubuntu-1804-3003-3-py3 - - centos-8-3003-3-py3 - - centos-7-3003-3-py3 - - fedora-34-3003-3-py3 - - fedora-33-3003-3-py3 - - opensuse-leap-153-3003-3-py3 - - opensuse-leap-152-3003-3-py3 - - opensuse-tmbl-latest-3003-3-py3 - - amazonlinux-2-3003-3-py3 - - oraclelinux-8-3003-3-py3 - - oraclelinux-7-3003-3-py3 - - arch-base-latest-3003-3-py3 - - gentoo-stage3-latest-3003-3-py3 - - gentoo-stage3-systemd-3003-3-py3 - - almalinux-8-3003-3-py3 - - freebsd-130-3003-1-py3 - - freebsd-122-3003-1-py3 - - windows-10-latest-py3 - - windows-81-latest-py3 - - windows-2019-latest-py3 - - windows-2016-latest-py3 + - name: default provisioner: state_top: base: @@ -407,82 +641,6 @@ suites: - salt.pkgrepo - salt.master - salt.minion - pillars: - top.sls: - base: - '*': - - salt - - v3003-py3 - pillars_from_files: - salt.sls: test/salt/pillar/salt.sls - v3003-py3.sls: test/salt/pillar/v3003-py3.sls verifier: inspec_tests: - - path: test/integration/v3003-py3 - - name: v3002-py3 - includes: - - debian-11-3002-7-py3 - - debian-10-3002-7-py3 - - debian-9-3002-7-py3 - - ubuntu-2004-3002-7-py3 - - ubuntu-1804-3002-7-py3 - - centos-8-3002-7-py3 - - centos-7-3002-7-py3 - - amazonlinux-2-3002-7-py3 - - oraclelinux-8-3002-7-py3 - - oraclelinux-7-3002-7-py3 - - gentoo-stage3-latest-3002-7-py3 - - gentoo-stage3-systemd-3002-7-py3 - - openbsd-69-3002-6-py3 - provisioner: - state_top: - base: - '*': - - salt._mapdata - - salt.pkgrepo - - salt.master - - salt.minion - pillars: - top.sls: - base: - '*': - - salt - - v3002-py3 - pillars_from_files: - salt.sls: test/salt/pillar/salt.sls - v3002-py3.sls: test/salt/pillar/v3002-py3.sls - verifier: - inspec_tests: - - path: test/integration/v3002-py3 - - name: v3001-py3 - includes: - - debian-10-3001-8-py3 - - debian-9-3001-8-py3 - - ubuntu-2004-3001-8-py3 - - ubuntu-1804-3001-8-py3 - - centos-8-3001-8-py3 - - centos-7-3001-8-py3 - - amazonlinux-2-3001-8-py3 - - oraclelinux-8-3001-8-py3 - - oraclelinux-7-3001-8-py3 - - openbsd-68-3001-1-py3 - provisioner: - state_top: - base: - '*': - - salt._mapdata - - salt.pkgrepo - - salt.master - - salt.minion - pillars: - top.sls: - base: - '*': - - salt - - v3001-py3 - pillars_from_files: - salt.sls: test/salt/pillar/salt.sls - v3001-py3.sls: test/salt/pillar/v3001-py3.sls - verifier: - inspec_tests: - - path: test/integration/v3001-py3 + - path: test/integration/default diff --git a/test/integration/default/README.md b/test/integration/default/README.md new file mode 100644 index 0000000..37cf963 --- /dev/null +++ b/test/integration/default/README.md @@ -0,0 +1,50 @@ +# InSpec Profile: `default` + +This shows the implementation of the `default` 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 default +Summary +------- +Location: default +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 default +.. + +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 default --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). diff --git a/test/integration/default/controls/_mapdata.rb b/test/integration/default/controls/_mapdata.rb new file mode 100644 index 0000000..b2b0541 --- /dev/null +++ b/test/integration/default/controls/_mapdata.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +require 'yaml' + +control 'salt._mapdata' do + title '`map.jinja` should match the reference file' + + ### Method + # The steps below for each file appear convoluted but they are both required + # and similar in nature: + # 1. The earliest method was to simply compare the files textually but this often + # led to false positives due to inconsistencies (e.g. spacing, ordering) + # 2. The next method was to load the files back into YAML structures and then + # compare but InSpec provided block diffs this way, unusable by end users + # 3. The final step was to dump the YAML structures back into a string to use + # for the comparison; this both worked and provided human-friendly diffs + + ### Comparison file for the specific platform + ### Static, adjusted as part of code contributions, as map data is changed + # Strip the `platform[:finger]` version number down to the "OS major release" + platform_finger = system.platform[:finger].split('.').first.to_s + # Use that to set the path to the file (relative to the InSpec suite directory) + mapdata_file_path = "_mapdata/#{platform_finger}.yaml" + # Load the mapdata from profile, into a YAML structure + # https://docs.chef.io/inspec/profiles/#profile-files + mapdata_file_yaml = YAML.load(inspec.profile.file(mapdata_file_path)) + # Dump the YAML back into a string for comparison + mapdata_file_dump = YAML.dump(mapdata_file_yaml) + + ### Output file produced by running the `_mapdata` state + ### Dynamic, generated during Kitchen's `converge` phase + # Derive the location of the dumped mapdata (differs for Windows) + output_dir = platform[:family] == 'windows' ? '/temp' : '/tmp' + # Use that to set the path to the file (absolute path, i.e. within the container) + output_file_path = "#{output_dir}/salt_mapdata_dump.yaml" + # Load the output into a YAML structure using InSpec's `yaml` resource + # https://github.com/inspec/inspec/blob/49b7d10/lib/inspec/resources/yaml.rb#L29 + output_file_yaml = yaml(output_file_path).params + # Dump the YAML back into a string for comparison + output_file_dump = YAML.dump(output_file_yaml) + + describe 'File content' do + it 'should match profile map data exactly' do + expect(output_file_dump).to eq(mapdata_file_dump) + end + end +end diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml new file mode 100644 index 0000000..777ca56 --- /dev/null +++ b/test/integration/default/inspec.yml @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +name: default +title: salt formula +maintainer: SaltStack Formulas +license: Apache-2.0 +summary: Verify that Salt is setup and configured +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 diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls new file mode 100644 index 0000000..c41b9ab --- /dev/null +++ b/test/salt/pillar/top.sls @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +base: + '*': + - salt + 'G@saltversioninfo:0:3003 and G@pythonversion:0:3': + - v3003-py3 + 'G@saltversioninfo:0:3002 and G@pythonversion:0:3': + - v3002-py3 + 'G@saltversioninfo:0:3001 and G@pythonversion:0:3': + - v3001-py3 +... From b475e24638edc7e6cbd5b131b3d1316727bf8246 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 17 Nov 2021 21:53:19 +0000 Subject: [PATCH 2/3] test: centralise all suites into `default` suite Modify the `default` suite to use the `saltmajorversion` InSpec input rather than the `version` variable in `pkgs_spec.rb`. --- .../controls/pkgs_spec.rb | 4 +- .../controls/service_spec.rb | 0 .../files/_mapdata/almalinux-8.yaml | 0 .../files/_mapdata/amazonlinux-2.yaml | 0 .../files/_mapdata/arch-base-latest.yaml | 0 .../files/_mapdata/centos-7.yaml | 0 .../files/_mapdata/centos-8.yaml | 0 .../files/_mapdata/debian-10.yaml | 0 .../files/_mapdata/debian-9.yaml | 2 +- .../files/_mapdata/fedora-33.yaml | 0 .../files/_mapdata/fedora-34.yaml | 0 .../files/_mapdata/freebsd-12.yaml | 0 .../files/_mapdata/freebsd-13.yaml | 0 .../files/_mapdata/gentoo-2-sysd.yaml | 0 .../files/_mapdata/gentoo-2-sysv.yaml | 0 .../files/_mapdata/openbsd-6.yaml | 0 .../files/_mapdata/opensuse-15.yaml | 0 .../files/_mapdata/opensuse-tumbleweed.yaml | 0 .../files/_mapdata/oraclelinux-7.yaml | 0 .../files/_mapdata/oraclelinux-8.yaml | 0 .../files/_mapdata/ubuntu-18.yaml | 0 .../files/_mapdata/ubuntu-20.yaml | 0 .../files/_mapdata/windows-10.yaml | 0 .../files/_mapdata/windows-2016-server.yaml | 0 .../files/_mapdata/windows-2019-server.yaml | 0 .../files/_mapdata/windows-8.yaml | 0 test/integration/v3001-py3/README.md | 50 -------- .../v3001-py3/controls/_mapdata.rb | 47 ------- .../v3001-py3/controls/pkgs_spec.rb | 26 ---- .../files/_mapdata/amazonlinux-2.yaml | 115 ----------------- .../v3001-py3/files/_mapdata/centos-7.yaml | 115 ----------------- .../v3001-py3/files/_mapdata/centos-8.yaml | 115 ----------------- .../v3001-py3/files/_mapdata/debian-10.yaml | 116 ----------------- .../v3001-py3/files/_mapdata/fedora-32.yaml | 115 ----------------- .../v3001-py3/files/_mapdata/fedora-33.yaml | 115 ----------------- .../files/_mapdata/gentoo-2-sysd.yaml | 112 ----------------- .../files/_mapdata/gentoo-2-sysv.yaml | 112 ----------------- .../v3001-py3/files/_mapdata/openbsd-6.yaml | 111 ---------------- .../v3001-py3/files/_mapdata/opensuse-15.yaml | 115 ----------------- .../files/_mapdata/opensuse-tumbleweed.yaml | 115 ----------------- .../files/_mapdata/oraclelinux-7.yaml | 115 ----------------- .../files/_mapdata/oraclelinux-8.yaml | 115 ----------------- .../v3001-py3/files/_mapdata/ubuntu-18.yaml | 118 ------------------ .../v3001-py3/files/_mapdata/ubuntu-20.yaml | 118 ------------------ test/integration/v3001-py3/inspec.yml | 27 ---- test/integration/v3002-py3/README.md | 50 -------- .../v3002-py3/controls/_mapdata.rb | 47 ------- .../v3002-py3/controls/service_spec.rb | 23 ---- .../files/_mapdata/amazonlinux-2.yaml | 115 ----------------- .../files/_mapdata/arch-base-latest.yaml | 114 ----------------- .../v3002-py3/files/_mapdata/centos-8.yaml | 115 ----------------- .../v3002-py3/files/_mapdata/debian-9.yaml | 116 ----------------- .../v3002-py3/files/_mapdata/fedora-32.yaml | 115 ----------------- .../v3002-py3/files/_mapdata/fedora-33.yaml | 115 ----------------- .../v3002-py3/files/_mapdata/fedora-34.yaml | 115 ----------------- .../v3002-py3/files/_mapdata/freebsd-11.yaml | 112 ----------------- .../v3002-py3/files/_mapdata/freebsd-12.yaml | 112 ----------------- .../v3002-py3/files/_mapdata/freebsd-13.yaml | 112 ----------------- .../files/_mapdata/gentoo-2-sysd.yaml | 112 ----------------- .../files/_mapdata/gentoo-2-sysv.yaml | 112 ----------------- .../v3002-py3/files/_mapdata/opensuse-15.yaml | 115 ----------------- .../files/_mapdata/opensuse-tumbleweed.yaml | 115 ----------------- .../files/_mapdata/oraclelinux-8.yaml | 115 ----------------- .../v3002-py3/files/_mapdata/ubuntu-20.yaml | 118 ------------------ .../v3002-py3/files/_mapdata/windows-10.yaml | 111 ---------------- .../files/_mapdata/windows-2016-server.yaml | 111 ---------------- .../files/_mapdata/windows-2019-server.yaml | 111 ---------------- .../v3002-py3/files/_mapdata/windows-8.yaml | 111 ---------------- test/integration/v3002-py3/inspec.yml | 27 ---- test/integration/v3003-py3/README.md | 50 -------- .../v3003-py3/controls/_mapdata.rb | 47 ------- .../v3003-py3/controls/pkgs_spec.rb | 26 ---- .../v3003-py3/controls/service_spec.rb | 23 ---- .../v3003-py3/files/_mapdata/centos-7.yaml | 115 ----------------- .../v3003-py3/files/_mapdata/debian-10.yaml | 117 ----------------- .../v3003-py3/files/_mapdata/debian-9.yaml | 117 ----------------- .../v3003-py3/files/_mapdata/fedora-32.yaml | 115 ----------------- .../v3003-py3/files/_mapdata/freebsd-11.yaml | 112 ----------------- .../files/_mapdata/oraclelinux-7.yaml | 115 ----------------- .../v3003-py3/files/_mapdata/ubuntu-18.yaml | 118 ------------------ test/integration/v3003-py3/inspec.yml | 27 ---- 81 files changed, 2 insertions(+), 5277 deletions(-) rename test/integration/{v3002-py3 => default}/controls/pkgs_spec.rb (83%) rename test/integration/{v3001-py3 => default}/controls/service_spec.rb (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/almalinux-8.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/amazonlinux-2.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/arch-base-latest.yaml (100%) rename test/integration/{v3002-py3 => default}/files/_mapdata/centos-7.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/centos-8.yaml (100%) rename test/integration/{v3002-py3 => default}/files/_mapdata/debian-10.yaml (100%) rename test/integration/{v3001-py3 => default}/files/_mapdata/debian-9.yaml (99%) rename test/integration/{v3003-py3 => default}/files/_mapdata/fedora-33.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/fedora-34.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/freebsd-12.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/freebsd-13.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/gentoo-2-sysd.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/gentoo-2-sysv.yaml (100%) rename test/integration/{v3002-py3 => default}/files/_mapdata/openbsd-6.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/opensuse-15.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/opensuse-tumbleweed.yaml (100%) rename test/integration/{v3002-py3 => default}/files/_mapdata/oraclelinux-7.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/oraclelinux-8.yaml (100%) rename test/integration/{v3002-py3 => default}/files/_mapdata/ubuntu-18.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/ubuntu-20.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/windows-10.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/windows-2016-server.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/windows-2019-server.yaml (100%) rename test/integration/{v3003-py3 => default}/files/_mapdata/windows-8.yaml (100%) delete mode 100644 test/integration/v3001-py3/README.md delete mode 100644 test/integration/v3001-py3/controls/_mapdata.rb delete mode 100644 test/integration/v3001-py3/controls/pkgs_spec.rb delete mode 100644 test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/centos-7.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/centos-8.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/debian-10.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/fedora-32.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/fedora-33.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml delete mode 100644 test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml delete mode 100644 test/integration/v3001-py3/inspec.yml delete mode 100644 test/integration/v3002-py3/README.md delete mode 100644 test/integration/v3002-py3/controls/_mapdata.rb delete mode 100644 test/integration/v3002-py3/controls/service_spec.rb delete mode 100644 test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/centos-8.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/debian-9.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/fedora-32.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/fedora-33.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/fedora-34.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/windows-10.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml delete mode 100644 test/integration/v3002-py3/files/_mapdata/windows-8.yaml delete mode 100644 test/integration/v3002-py3/inspec.yml delete mode 100644 test/integration/v3003-py3/README.md delete mode 100644 test/integration/v3003-py3/controls/_mapdata.rb delete mode 100644 test/integration/v3003-py3/controls/pkgs_spec.rb delete mode 100644 test/integration/v3003-py3/controls/service_spec.rb delete mode 100644 test/integration/v3003-py3/files/_mapdata/centos-7.yaml delete mode 100644 test/integration/v3003-py3/files/_mapdata/debian-10.yaml delete mode 100644 test/integration/v3003-py3/files/_mapdata/debian-9.yaml delete mode 100644 test/integration/v3003-py3/files/_mapdata/fedora-32.yaml delete mode 100644 test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml delete mode 100644 test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml delete mode 100644 test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml delete mode 100644 test/integration/v3003-py3/inspec.yml diff --git a/test/integration/v3002-py3/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb similarity index 83% rename from test/integration/v3002-py3/controls/pkgs_spec.rb rename to test/integration/default/controls/pkgs_spec.rb index 207d467..389aba1 100644 --- a/test/integration/v3002-py3/controls/pkgs_spec.rb +++ b/test/integration/default/controls/pkgs_spec.rb @@ -15,12 +15,10 @@ pkgs = control 'salt packages' do title 'should be installed' - version = '3002' - pkgs.each do |p| describe package(p) do it { should be_installed } - its('version') { should match(/^#{version}/) } + its('version') { should match(/^#{input('saltmajorversion')}/) } end end end diff --git a/test/integration/v3001-py3/controls/service_spec.rb b/test/integration/default/controls/service_spec.rb similarity index 100% rename from test/integration/v3001-py3/controls/service_spec.rb rename to test/integration/default/controls/service_spec.rb diff --git a/test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/almalinux-8.yaml rename to test/integration/default/files/_mapdata/almalinux-8.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml rename to test/integration/default/files/_mapdata/amazonlinux-2.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml rename to test/integration/default/files/_mapdata/arch-base-latest.yaml diff --git a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml similarity index 100% rename from test/integration/v3002-py3/files/_mapdata/centos-7.yaml rename to test/integration/default/files/_mapdata/centos-7.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/centos-8.yaml rename to test/integration/default/files/_mapdata/centos-8.yaml diff --git a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml similarity index 100% rename from test/integration/v3002-py3/files/_mapdata/debian-10.yaml rename to test/integration/default/files/_mapdata/debian-10.yaml diff --git a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml similarity index 99% rename from test/integration/v3001-py3/files/_mapdata/debian-9.yaml rename to test/integration/default/files/_mapdata/debian-9.yaml index 7af01f3..fc83a9f 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -96,7 +96,7 @@ values: release: '3001' restart_via_at: false retry_options: - attempts: 2 + attempts: 5 interval: 10 splay: 10 until: true diff --git a/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/fedora-33.yaml rename to test/integration/default/files/_mapdata/fedora-33.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/fedora-34.yaml rename to test/integration/default/files/_mapdata/fedora-34.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml rename to test/integration/default/files/_mapdata/freebsd-12.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml rename to test/integration/default/files/_mapdata/freebsd-13.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml rename to test/integration/default/files/_mapdata/gentoo-2-sysd.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml rename to test/integration/default/files/_mapdata/gentoo-2-sysv.yaml diff --git a/test/integration/v3002-py3/files/_mapdata/openbsd-6.yaml b/test/integration/default/files/_mapdata/openbsd-6.yaml similarity index 100% rename from test/integration/v3002-py3/files/_mapdata/openbsd-6.yaml rename to test/integration/default/files/_mapdata/openbsd-6.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml rename to test/integration/default/files/_mapdata/opensuse-15.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml rename to test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml similarity index 100% rename from test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml rename to test/integration/default/files/_mapdata/oraclelinux-7.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml rename to test/integration/default/files/_mapdata/oraclelinux-8.yaml diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml similarity index 100% rename from test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml rename to test/integration/default/files/_mapdata/ubuntu-18.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml rename to test/integration/default/files/_mapdata/ubuntu-20.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/windows-10.yaml b/test/integration/default/files/_mapdata/windows-10.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/windows-10.yaml rename to test/integration/default/files/_mapdata/windows-10.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml b/test/integration/default/files/_mapdata/windows-2016-server.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml rename to test/integration/default/files/_mapdata/windows-2016-server.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/default/files/_mapdata/windows-2019-server.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml rename to test/integration/default/files/_mapdata/windows-2019-server.yaml diff --git a/test/integration/v3003-py3/files/_mapdata/windows-8.yaml b/test/integration/default/files/_mapdata/windows-8.yaml similarity index 100% rename from test/integration/v3003-py3/files/_mapdata/windows-8.yaml rename to test/integration/default/files/_mapdata/windows-8.yaml diff --git a/test/integration/v3001-py3/README.md b/test/integration/v3001-py3/README.md deleted file mode 100644 index aa1bb89..0000000 --- a/test/integration/v3001-py3/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# InSpec Profile: `v3001-py3` - -This shows the implementation of the `v3001-py3` 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 v3001-py3 -Summary -------- -Location: v3001-py3 -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 v3001-py3 -.. - -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 v3001-py3 --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). diff --git a/test/integration/v3001-py3/controls/_mapdata.rb b/test/integration/v3001-py3/controls/_mapdata.rb deleted file mode 100644 index b2b0541..0000000 --- a/test/integration/v3001-py3/controls/_mapdata.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -require 'yaml' - -control 'salt._mapdata' do - title '`map.jinja` should match the reference file' - - ### Method - # The steps below for each file appear convoluted but they are both required - # and similar in nature: - # 1. The earliest method was to simply compare the files textually but this often - # led to false positives due to inconsistencies (e.g. spacing, ordering) - # 2. The next method was to load the files back into YAML structures and then - # compare but InSpec provided block diffs this way, unusable by end users - # 3. The final step was to dump the YAML structures back into a string to use - # for the comparison; this both worked and provided human-friendly diffs - - ### Comparison file for the specific platform - ### Static, adjusted as part of code contributions, as map data is changed - # Strip the `platform[:finger]` version number down to the "OS major release" - platform_finger = system.platform[:finger].split('.').first.to_s - # Use that to set the path to the file (relative to the InSpec suite directory) - mapdata_file_path = "_mapdata/#{platform_finger}.yaml" - # Load the mapdata from profile, into a YAML structure - # https://docs.chef.io/inspec/profiles/#profile-files - mapdata_file_yaml = YAML.load(inspec.profile.file(mapdata_file_path)) - # Dump the YAML back into a string for comparison - mapdata_file_dump = YAML.dump(mapdata_file_yaml) - - ### Output file produced by running the `_mapdata` state - ### Dynamic, generated during Kitchen's `converge` phase - # Derive the location of the dumped mapdata (differs for Windows) - output_dir = platform[:family] == 'windows' ? '/temp' : '/tmp' - # Use that to set the path to the file (absolute path, i.e. within the container) - output_file_path = "#{output_dir}/salt_mapdata_dump.yaml" - # Load the output into a YAML structure using InSpec's `yaml` resource - # https://github.com/inspec/inspec/blob/49b7d10/lib/inspec/resources/yaml.rb#L29 - output_file_yaml = yaml(output_file_path).params - # Dump the YAML back into a string for comparison - output_file_dump = YAML.dump(output_file_yaml) - - describe 'File content' do - it 'should match profile map data exactly' do - expect(output_file_dump).to eq(mapdata_file_dump) - end - end -end diff --git a/test/integration/v3001-py3/controls/pkgs_spec.rb b/test/integration/v3001-py3/controls/pkgs_spec.rb deleted file mode 100644 index 585d256..0000000 --- a/test/integration/v3001-py3/controls/pkgs_spec.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -pkgs = - case system.platform[:name] - when 'arch' - %w[salt] - when /bsd$/ - %w[py38-salt-3002.6] - when 'windows' - ['Salt Minion'] - else - %w[salt-master salt-minion] - end - -control 'salt packages' do - title 'should be installed' - - version = '3001' - - pkgs.each do |p| - describe package(p) do - it { should be_installed } - its('version') { should match(/^#{version}/) } - end - end -end diff --git a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml deleted file mode 100644 index 01adc38..0000000 --- a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Amazon Linux-2 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3001/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3001 - pkgrepo_humanname: SaltStack repo for Amazon Linux 2 - pkgrepo_name: saltstack-amzn-repo - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml deleted file mode 100644 index 81a9f06..0000000 --- a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# CentOS Linux-7 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml deleted file mode 100644 index acee1f7..0000000 --- a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# CentOS Linux-8 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml deleted file mode 100644 index 236b55f..0000000 --- a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml +++ /dev/null @@ -1,116 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Debian-10 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/10/amd64/3001 buster main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3001/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml deleted file mode 100644 index c0ec911..0000000 --- a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Fedora-32 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python2-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml deleted file mode 100644 index e1c55e2..0000000 --- a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Fedora-33 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python2-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml deleted file mode 100644 index aacd314..0000000 --- a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Gentoo-2 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pyinotify: dev-python/pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: app-admin/salt - salt_cloud: app-admin/salt - salt_master: app-admin/salt - salt_master_macos_plist_hash: '' - salt_minion: app-admin/salt - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: app-admin/salt - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml deleted file mode 100644 index aacd314..0000000 --- a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Gentoo-2 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pyinotify: dev-python/pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: app-admin/salt - salt_cloud: app-admin/salt - salt_master: app-admin/salt - salt_master_macos_plist_hash: '' - salt_minion: app-admin/salt - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: app-admin/salt - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml b/test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml deleted file mode 100644 index 8a4bb77..0000000 --- a/test/integration/v3001-py3/files/_mapdata/openbsd-6.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# OpenBSD-6 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt_master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt_minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - python_dulwich: py3-dulwich - python_git: py3-GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt - salt_cloud: salt - salt_master: salt - salt_master_macos_plist_hash: '' - salt_minion: salt - salt_minion_macos_plist_hash: '' - salt_ssh: salt - salt_syndic: salt - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml deleted file mode 100644 index 5c567d7..0000000 --- a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Leap-15 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/ - pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2) - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml deleted file mode 100644 index a6b6d24..0000000 --- a/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# openSUSE Tumbleweed-yyyymmdd ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/ - pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Tumbleweed) - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml deleted file mode 100644 index fafd191..0000000 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Oracle Linux Server-7 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3001/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3001 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml deleted file mode 100644 index baa32c5..0000000 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Oracle Linux Server-8 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3001 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml deleted file mode 100644 index 87605c4..0000000 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml +++ /dev/null @@ -1,118 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-18.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001 bionic main - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml deleted file mode 100644 index bda1f69..0000000 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml +++ /dev/null @@ -1,118 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-20.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001 focal main - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/inspec.yml b/test/integration/v3001-py3/inspec.yml deleted file mode 100644 index d189f24..0000000 --- a/test/integration/v3001-py3/inspec.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- -name: v3001-py3 -title: salt formula -maintainer: SaltStack Formulas -license: Apache-2.0 -summary: Verify that Salt `v3001-py3` is setup and configured -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 diff --git a/test/integration/v3002-py3/README.md b/test/integration/v3002-py3/README.md deleted file mode 100644 index 32f3cfe..0000000 --- a/test/integration/v3002-py3/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# InSpec Profile: `v3002-py3` - -This shows the implementation of the `v3002-py3` 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 v3002-py3 -Summary -------- -Location: v3002-py3 -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 v3002-py3 -.. - -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 v3002-py3 --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). diff --git a/test/integration/v3002-py3/controls/_mapdata.rb b/test/integration/v3002-py3/controls/_mapdata.rb deleted file mode 100644 index b2b0541..0000000 --- a/test/integration/v3002-py3/controls/_mapdata.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -require 'yaml' - -control 'salt._mapdata' do - title '`map.jinja` should match the reference file' - - ### Method - # The steps below for each file appear convoluted but they are both required - # and similar in nature: - # 1. The earliest method was to simply compare the files textually but this often - # led to false positives due to inconsistencies (e.g. spacing, ordering) - # 2. The next method was to load the files back into YAML structures and then - # compare but InSpec provided block diffs this way, unusable by end users - # 3. The final step was to dump the YAML structures back into a string to use - # for the comparison; this both worked and provided human-friendly diffs - - ### Comparison file for the specific platform - ### Static, adjusted as part of code contributions, as map data is changed - # Strip the `platform[:finger]` version number down to the "OS major release" - platform_finger = system.platform[:finger].split('.').first.to_s - # Use that to set the path to the file (relative to the InSpec suite directory) - mapdata_file_path = "_mapdata/#{platform_finger}.yaml" - # Load the mapdata from profile, into a YAML structure - # https://docs.chef.io/inspec/profiles/#profile-files - mapdata_file_yaml = YAML.load(inspec.profile.file(mapdata_file_path)) - # Dump the YAML back into a string for comparison - mapdata_file_dump = YAML.dump(mapdata_file_yaml) - - ### Output file produced by running the `_mapdata` state - ### Dynamic, generated during Kitchen's `converge` phase - # Derive the location of the dumped mapdata (differs for Windows) - output_dir = platform[:family] == 'windows' ? '/temp' : '/tmp' - # Use that to set the path to the file (absolute path, i.e. within the container) - output_file_path = "#{output_dir}/salt_mapdata_dump.yaml" - # Load the output into a YAML structure using InSpec's `yaml` resource - # https://github.com/inspec/inspec/blob/49b7d10/lib/inspec/resources/yaml.rb#L29 - output_file_yaml = yaml(output_file_path).params - # Dump the YAML back into a string for comparison - output_file_dump = YAML.dump(output_file_yaml) - - describe 'File content' do - it 'should match profile map data exactly' do - expect(output_file_dump).to eq(mapdata_file_dump) - end - end -end diff --git a/test/integration/v3002-py3/controls/service_spec.rb b/test/integration/v3002-py3/controls/service_spec.rb deleted file mode 100644 index be3dab7..0000000 --- a/test/integration/v3002-py3/controls/service_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -services = - case system.platform[:family] - when 'bsd' - %w[salt_master salt_minion] - when 'windows' - %w[salt-minion] - else - %w[salt-master salt-minion] - end - -control 'salt services' do - title 'should be running' - - services.each do |p| - describe service(p) do - it { should be_installed } - it { should be_enabled } - it { should be_running } - end - end -end diff --git a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml deleted file mode 100644 index e613c8f..0000000 --- a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Amazon Linux-2 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/amazon/2/$basearch/3002/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3002 - pkgrepo_humanname: SaltStack repo for Amazon Linux 2 - pkgrepo_name: saltstack-amzn-repo - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml b/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml deleted file mode 100644 index ee3e26f..0000000 --- a/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml +++ /dev/null @@ -1,114 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Arch ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - libgit2: libgit2 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pygit2: python2-pygit2 - pyinotify: python2-pyinotify - python_dulwich: python-dulwich - python_git: python2-gitpython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt - salt_cloud: salt - salt_master: salt - salt_master_macos_plist_hash: '' - salt_minion: salt - salt_minion_macos_plist_hash: '' - salt_ssh: salt - salt_syndic: salt - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml deleted file mode 100644 index 40d5f71..0000000 --- a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# CentOS Linux-8 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml deleted file mode 100644 index 073288e..0000000 --- a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml +++ /dev/null @@ -1,116 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Debian-9 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml deleted file mode 100644 index 61eb6f3..0000000 --- a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Fedora-32 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python2-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml deleted file mode 100644 index 365b91e..0000000 --- a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Fedora-33 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python2-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml deleted file mode 100644 index 333c6c7..0000000 --- a/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Fedora-34 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python2-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml deleted file mode 100644 index bc9ea0c..0000000 --- a/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# FreeBSD-11 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt_api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /usr/local/etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt_master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt_minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pygit2: py38-pygit2 - python_dulwich: py38-dulwich - python_git: py38-gitpython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: wheel - rootuser: root - salt_api: py38-salt - salt_cloud: py38-salt - salt_master: py38-salt - salt_master_macos_plist_hash: '' - salt_minion: py38-salt - salt_minion_macos_plist_hash: '' - salt_ssh: py38-salt - salt_syndic: py38-salt - ssh_roster: {} - syndic_service: salt_syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml deleted file mode 100644 index 149b4a1..0000000 --- a/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# FreeBSD-12 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt_api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /usr/local/etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt_master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt_minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pygit2: py38-pygit2 - python_dulwich: py38-dulwich - python_git: py38-gitpython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: wheel - rootuser: root - salt_api: py38-salt - salt_cloud: py38-salt - salt_master: py38-salt - salt_master_macos_plist_hash: '' - salt_minion: py38-salt - salt_minion_macos_plist_hash: '' - salt_ssh: py38-salt - salt_syndic: py38-salt - ssh_roster: {} - syndic_service: salt_syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml deleted file mode 100644 index 97694bc..0000000 --- a/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# FreeBSD-13 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt_api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /usr/local/etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt_master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt_minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pygit2: py38-pygit2 - python_dulwich: py38-dulwich - python_git: py38-gitpython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: wheel - rootuser: root - salt_api: py38-salt - salt_cloud: py38-salt - salt_master: py38-salt - salt_master_macos_plist_hash: '' - salt_minion: py38-salt - salt_minion_macos_plist_hash: '' - salt_ssh: py38-salt - salt_syndic: py38-salt - ssh_roster: {} - syndic_service: salt_syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml deleted file mode 100644 index daba38c..0000000 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Gentoo-2 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pyinotify: dev-python/pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: app-admin/salt - salt_cloud: app-admin/salt - salt_master: app-admin/salt - salt_master_macos_plist_hash: '' - salt_minion: app-admin/salt - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: app-admin/salt - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml deleted file mode 100644 index daba38c..0000000 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Gentoo-2 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pyinotify: dev-python/pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: app-admin/salt - salt_cloud: app-admin/salt - salt_master: app-admin/salt - salt_master_macos_plist_hash: '' - salt_minion: app-admin/salt - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: app-admin/salt - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml deleted file mode 100644 index 314a9fc..0000000 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Leap-15 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/ - pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2) - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml deleted file mode 100644 index 7a20fe0..0000000 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# openSUSE Tumbleweed-yyyymmdd ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/repodata/repomd.xml.key - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Tumbleweed/ - pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Tumbleweed) - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml deleted file mode 100644 index a1a0542..0000000 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Oracle Linux Server-8 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3002 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml deleted file mode 100644 index 7a92bad..0000000 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml +++ /dev/null @@ -1,118 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-20.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002 focal main - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/windows-10.yaml b/test/integration/v3002-py3/files/_mapdata/windows-10.yaml deleted file mode 100644 index b4c02e4..0000000 --- a/test/integration/v3002-py3/files/_mapdata/windows-10.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Windows-10 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: "/srv/formulas" - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: C:\salt\conf - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: "/usr/src/" - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - "/srv/pillar" - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - "/srv/pillar" - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: false - pin_version: false - pkgrepo: '' - py_ver: py3 - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: vagrant - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion-py3 - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml b/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml deleted file mode 100644 index 2d29555..0000000 --- a/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Windows-2016Server ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: "/srv/formulas" - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: C:\salt\conf - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: "/usr/src/" - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - "/srv/pillar" - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - "/srv/pillar" - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: false - pin_version: false - pkgrepo: '' - py_ver: py3 - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: kitchen - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion-py3 - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml deleted file mode 100644 index 55e2033..0000000 --- a/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Windows-2019Server ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: "/srv/formulas" - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: C:\salt\conf - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: "/usr/src/" - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - "/srv/pillar" - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - "/srv/pillar" - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: false - pin_version: false - pkgrepo: '' - py_ver: py3 - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: kitchen - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion-py3 - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/windows-8.yaml b/test/integration/v3002-py3/files/_mapdata/windows-8.yaml deleted file mode 100644 index df69b37..0000000 --- a/test/integration/v3002-py3/files/_mapdata/windows-8.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Windows-8.1 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: "/srv/formulas" - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: C:\salt\conf - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: "/usr/src/" - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - "/srv/pillar" - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - "/srv/salt" - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - "/srv/pillar" - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: false - pin_version: false - pkgrepo: '' - py_ver: py3 - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: vagrant - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion-py3 - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/inspec.yml b/test/integration/v3002-py3/inspec.yml deleted file mode 100644 index 3a1a25c..0000000 --- a/test/integration/v3002-py3/inspec.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- -name: v3002-py3 -title: salt formula -maintainer: SaltStack Formulas -license: Apache-2.0 -summary: Verify that Salt `v3002-py3` is setup and configured -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 diff --git a/test/integration/v3003-py3/README.md b/test/integration/v3003-py3/README.md deleted file mode 100644 index 49080dd..0000000 --- a/test/integration/v3003-py3/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# InSpec Profile: `v3003-py3` - -This shows the implementation of the `v3003-py3` 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 v3003-py3 -Summary -------- -Location: v3003-py3 -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 v3003-py3 -.. - -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 v3003-py3 --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). diff --git a/test/integration/v3003-py3/controls/_mapdata.rb b/test/integration/v3003-py3/controls/_mapdata.rb deleted file mode 100644 index b2b0541..0000000 --- a/test/integration/v3003-py3/controls/_mapdata.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -require 'yaml' - -control 'salt._mapdata' do - title '`map.jinja` should match the reference file' - - ### Method - # The steps below for each file appear convoluted but they are both required - # and similar in nature: - # 1. The earliest method was to simply compare the files textually but this often - # led to false positives due to inconsistencies (e.g. spacing, ordering) - # 2. The next method was to load the files back into YAML structures and then - # compare but InSpec provided block diffs this way, unusable by end users - # 3. The final step was to dump the YAML structures back into a string to use - # for the comparison; this both worked and provided human-friendly diffs - - ### Comparison file for the specific platform - ### Static, adjusted as part of code contributions, as map data is changed - # Strip the `platform[:finger]` version number down to the "OS major release" - platform_finger = system.platform[:finger].split('.').first.to_s - # Use that to set the path to the file (relative to the InSpec suite directory) - mapdata_file_path = "_mapdata/#{platform_finger}.yaml" - # Load the mapdata from profile, into a YAML structure - # https://docs.chef.io/inspec/profiles/#profile-files - mapdata_file_yaml = YAML.load(inspec.profile.file(mapdata_file_path)) - # Dump the YAML back into a string for comparison - mapdata_file_dump = YAML.dump(mapdata_file_yaml) - - ### Output file produced by running the `_mapdata` state - ### Dynamic, generated during Kitchen's `converge` phase - # Derive the location of the dumped mapdata (differs for Windows) - output_dir = platform[:family] == 'windows' ? '/temp' : '/tmp' - # Use that to set the path to the file (absolute path, i.e. within the container) - output_file_path = "#{output_dir}/salt_mapdata_dump.yaml" - # Load the output into a YAML structure using InSpec's `yaml` resource - # https://github.com/inspec/inspec/blob/49b7d10/lib/inspec/resources/yaml.rb#L29 - output_file_yaml = yaml(output_file_path).params - # Dump the YAML back into a string for comparison - output_file_dump = YAML.dump(output_file_yaml) - - describe 'File content' do - it 'should match profile map data exactly' do - expect(output_file_dump).to eq(mapdata_file_dump) - end - end -end diff --git a/test/integration/v3003-py3/controls/pkgs_spec.rb b/test/integration/v3003-py3/controls/pkgs_spec.rb deleted file mode 100644 index 75df0bc..0000000 --- a/test/integration/v3003-py3/controls/pkgs_spec.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -pkgs = - case system.platform[:name] - when 'arch' - %w[salt] - when /bsd$/ - %w[py38-salt] - when 'windows' - ['Salt Minion'] - else - %w[salt-master salt-minion] - end - -control 'salt packages' do - title 'should be installed' - - version = '3003' - - pkgs.each do |p| - describe package(p) do - it { should be_installed } - its('version') { should match(/^#{version}/) } - end - end -end diff --git a/test/integration/v3003-py3/controls/service_spec.rb b/test/integration/v3003-py3/controls/service_spec.rb deleted file mode 100644 index be3dab7..0000000 --- a/test/integration/v3003-py3/controls/service_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -services = - case system.platform[:family] - when 'bsd' - %w[salt_master salt_minion] - when 'windows' - %w[salt-minion] - else - %w[salt-master salt-minion] - end - -control 'salt services' do - title 'should be running' - - services.each do |p| - describe service(p) do - it { should be_installed } - it { should be_enabled } - it { should be_running } - end - end -end diff --git a/test/integration/v3003-py3/files/_mapdata/centos-7.yaml b/test/integration/v3003-py3/files/_mapdata/centos-7.yaml deleted file mode 100644 index 27384e1..0000000 --- a/test/integration/v3003-py3/files/_mapdata/centos-7.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# CentOS Linux-7 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3003' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/debian-10.yaml b/test/integration/v3003-py3/files/_mapdata/debian-10.yaml deleted file mode 100644 index 17e36b6..0000000 --- a/test/integration/v3003-py3/files/_mapdata/debian-10.yaml +++ /dev/null @@ -1,117 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Debian-10 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/debian/10/amd64/3003/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3003/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3003' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/debian-9.yaml b/test/integration/v3003-py3/files/_mapdata/debian-9.yaml deleted file mode 100644 index acf4962..0000000 --- a/test/integration/v3003-py3/files/_mapdata/debian-9.yaml +++ /dev/null @@ -1,117 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Debian-9 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/debian/9/amd64/3003/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3003/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3003' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml deleted file mode 100644 index 1df4621..0000000 --- a/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Fedora-32 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python2-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3003' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml deleted file mode 100644 index 91198a8..0000000 --- a/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# FreeBSD-11 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt_api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /usr/local/etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: true - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt_master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt_minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: '' - py_ver: py3 - pygit2: py38-pygit2 - python_dulwich: py38-dulwich - python_git: py38-gitpython - release: '3003' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: wheel - rootuser: root - salt_api: py38-salt - salt_cloud: py38-salt - salt_master: py38-salt - salt_master_macos_plist_hash: '' - salt_minion: py38-salt - salt_minion_macos_plist_hash: '' - salt_ssh: py38-salt - salt_syndic: py38-salt - ssh_roster: {} - syndic_service: salt_syndic - use_pip: false - version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml deleted file mode 100644 index 2d73683..0000000 --- a/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Oracle Linux Server-7 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: git - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: true - version: 0.23.0 - version: 0.23.0 - install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/7/$basearch/3003/SALTSTACK-GPG-KEY.pub - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: pygit2 - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3003 - pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 - pkgrepo_name: saltstack - py_ver: py3 - pygit2: python-pygit2 - python_dulwich: python-dulwich - python_git: GitPython - release: '3003' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml deleted file mode 100644 index 743b9df..0000000 --- a/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml +++ /dev/null @@ -1,118 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-18.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003 bionic main - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3003' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3003-py3/inspec.yml b/test/integration/v3003-py3/inspec.yml deleted file mode 100644 index 477ea5d..0000000 --- a/test/integration/v3003-py3/inspec.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- -name: v3003-py3 -title: salt formula -maintainer: SaltStack Formulas -license: Apache-2.0 -summary: Verify that Salt `v3003-py3` is setup and configured -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 From db5b69c9cda824194a891c515f19baabe46748b6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 17 Nov 2021 21:53:22 +0000 Subject: [PATCH 3/3] test(pillar): centralise and clean-up entries --- test/salt/pillar/salt.sls | 4 ++++ test/salt/pillar/v3001-py3.sls | 1 - test/salt/pillar/v3002-py3.sls | 8 -------- test/salt/pillar/v3003-py3.sls | 8 -------- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/test/salt/pillar/salt.sls b/test/salt/pillar/salt.sls index 91e0339..b469f0d 100644 --- a/test/salt/pillar/salt.sls +++ b/test/salt/pillar/salt.sls @@ -2,6 +2,10 @@ # vim: ft=yaml --- salt: + py_ver: 'py3' + # Override used for FreeBSD minion service + retry_options: + attempts: 5 master: fileserver_backend: - rootfs diff --git a/test/salt/pillar/v3001-py3.sls b/test/salt/pillar/v3001-py3.sls index cbeffe1..d40808e 100644 --- a/test/salt/pillar/v3001-py3.sls +++ b/test/salt/pillar/v3001-py3.sls @@ -3,4 +3,3 @@ --- salt: release: '3001' - py_ver: 'py3' diff --git a/test/salt/pillar/v3002-py3.sls b/test/salt/pillar/v3002-py3.sls index e9298e8..55c9269 100644 --- a/test/salt/pillar/v3002-py3.sls +++ b/test/salt/pillar/v3002-py3.sls @@ -3,11 +3,3 @@ --- salt: release: '3002' - py_ver: 'py3' - - # Override used for FreeBSD minion service - retry_options: - attempts: 5 - until: true - interval: 10 - splay: 10 diff --git a/test/salt/pillar/v3003-py3.sls b/test/salt/pillar/v3003-py3.sls index f97a266..bb7eff9 100644 --- a/test/salt/pillar/v3003-py3.sls +++ b/test/salt/pillar/v3003-py3.sls @@ -3,11 +3,3 @@ --- salt: release: '3003' - py_ver: 'py3' - - # Override used for FreeBSD minion service - retry_options: - attempts: 5 - until: true - interval: 10 - splay: 10