diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 43a1b48..ec522f3 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -18,8 +18,8 @@ jobs: - v3002-py3-freebsd-122-3002-6-py3 - v3002-py3-freebsd-114-3002-6-py3 - v3001-py3-openbsd-68-3001-1-py3 - - v3002-py3-windows-10-latest-py3 - - v3002-py3-windows-81-latest-py3 + - v3003-py3-windows-10-latest-py3 + - v3003-py3-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 be35bf8..d49f492 100644 --- a/.github/workflows/kitchen.windows.yml +++ b/.github/workflows/kitchen.windows.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: instance: - - v3002-py3-windows-2019-latest-py3 + - v3003-py3-windows-2019-latest-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' @@ -61,7 +61,7 @@ jobs: fail-fast: false matrix: instance: - - v3002-py3-windows-2016-latest-py3 + - v3003-py3-windows-2016-latest-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 512953a..86e7869 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,53 +123,68 @@ 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` -v3002-py3-debian-10-3002-5-py3: {extends: '.test_instance'} -v3002-py3-debian-9-3002-5-py3: {extends: '.test_instance'} -v3002-py3-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} -v3002-py3-ubuntu-1804-3002-5-py3: {extends: '.test_instance'} -v3002-py3-ubuntu-1604-3002-5-py3: {extends: '.test_instance'} -v3002-py3-centos-8-3002-5-py3: {extends: '.test_instance'} -v3002-py3-centos-7-3002-5-py3: {extends: '.test_instance'} -v3002-py3-fedora-33-3002-5-py3: {extends: '.test_instance'} -# v3002-py3-fedora-32-3002-5-py3: {extends: '.test_instance'} -v3002-py3-amazonlinux-2-3002-5-py3: {extends: '.test_instance'} -v3002-py3-oraclelinux-8-3002-5-py3: {extends: '.test_instance'} -v3002-py3-oraclelinux-7-3002-5-py3: {extends: '.test_instance'} -v3002-py3-arch-base-latest-3002-5-py3: {extends: '.test_instance'} -v3002-py3-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} -v3002-py3-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} -v3001-py3-debian-10-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-debian-9-3001-6-py3: {extends: '.test_instance'} -v3001-py3-ubuntu-2004-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-ubuntu-1804-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-ubuntu-1604-3001-6-py3: {extends: '.test_instance'} -v3001-py3-centos-8-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-centos-7-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-fedora-33-3001-6-py3: {extends: '.test_instance'} -v3001-py3-fedora-32-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-amazonlinux-2-3001-6-py3: {extends: '.test_instance'} -v3001-py3-oraclelinux-8-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-oraclelinux-7-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-arch-base-latest-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'} -# v3001-py3-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'} -# v3000-py3-debian-10-3000-8-py3: {extends: '.test_instance'} -v3000-py3-debian-9-3000-8-py3: {extends: '.test_instance'} -v3000-py3-ubuntu-1804-3000-8-py3: {extends: '.test_instance'} -# v3000-py3-ubuntu-1604-3000-8-py3: {extends: '.test_instance'} -# v3000-py3-centos-8-3000-8-py3: {extends: '.test_instance'} -v3000-py3-centos-7-3000-8-py3: {extends: '.test_instance'} -# v3000-py3-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'} -# v3000-py3-amazonlinux-2-3000-8-py3: {extends: '.test_instance'} -# v3000-py3-oraclelinux-8-3000-8-py3: {extends: '.test_instance'} -v3000-py3-oraclelinux-7-3000-8-py3: {extends: '.test_instance'} -# v3000-py3-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} -# v3000-py3-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} -# v3000-py2-ubuntu-1804-3000-8-py2: {extends: '.test_instance'} -v3000-py2-ubuntu-1604-3000-8-py2: {extends: '.test_instance'} -# v3000-py2-arch-base-latest-3000-8-py2: {extends: '.test_instance'} +v3003-py3-debian-10-3003-0-py3: {extends: '.test_instance'} +# v3003-py3-debian-9-3003-0-py3: {extends: '.test_instance'} +v3003-py3-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} +# v3003-py3-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} +v3003-py3-centos-8-3003-0-py3: {extends: '.test_instance'} +# v3003-py3-centos-7-3003-0-py3: {extends: '.test_instance'} +# v3003-py3-fedora-34-3003-0-py3: {extends: '.test_instance'} +# v3003-py3-fedora-33-3003-0-py3: {extends: '.test_instance'} +# v3003-py3-fedora-32-3003-0-py3: {extends: '.test_instance'} +v3003-py3-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} +v3003-py3-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} +# v3003-py3-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} +v3003-py3-arch-base-latest-3003-0-py3: {extends: '.test_instance'} +v3003-py3-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} +v3003-py3-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} +# v3002-py3-debian-10-3002-6-py3: {extends: '.test_instance'} +v3002-py3-debian-9-3002-6-py3: {extends: '.test_instance'} +# v3002-py3-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} +v3002-py3-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} +# v3002-py3-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} +# v3002-py3-centos-8-3002-6-py3: {extends: '.test_instance'} +v3002-py3-centos-7-3002-6-py3: {extends: '.test_instance'} +v3002-py3-fedora-34-3002-6-py3: {extends: '.test_instance'} +v3002-py3-fedora-33-3002-6-py3: {extends: '.test_instance'} +# v3002-py3-fedora-32-3002-6-py3: {extends: '.test_instance'} +v3002-py3-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} +# v3002-py3-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} +v3002-py3-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} +# v3002-py3-arch-base-latest-3002-6-py3: {extends: '.test_instance'} +# v3002-py3-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} +# v3002-py3-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} +v3002-py3-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} +v3002-py3-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} +v3001-py3-debian-10-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-debian-9-3001-7-py3: {extends: '.test_instance'} +v3001-py3-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} +v3001-py3-centos-8-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-centos-7-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-fedora-34-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-fedora-33-3001-7-py3: {extends: '.test_instance'} +v3001-py3-fedora-32-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} +v3001-py3-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} +# v3001-py3-arch-base-latest-3001-7-py3: {extends: '.test_instance'} +# v3000-py3-debian-10-3000-9-py3: {extends: '.test_instance'} +v3000-py3-debian-9-3000-9-py3: {extends: '.test_instance'} +v3000-py3-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} +# v3000-py3-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} +# v3000-py3-centos-8-3000-9-py3: {extends: '.test_instance'} +v3000-py3-centos-7-3000-9-py3: {extends: '.test_instance'} +# v3000-py3-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} +# v3000-py3-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} +# v3000-py3-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} +v3000-py3-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} +# v3000-py2-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} +v3000-py2-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} +# v3000-py2-arch-base-latest-3000-9-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 2a4e50f..5714945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,53 +83,68 @@ 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=v3002-py3-debian-10-3002-5-py3 - - env: INSTANCE=v3002-py3-debian-9-3002-5-py3 - - env: INSTANCE=v3002-py3-ubuntu-2004-3002-5-py3 - - env: INSTANCE=v3002-py3-ubuntu-1804-3002-5-py3 - - env: INSTANCE=v3002-py3-ubuntu-1604-3002-5-py3 - - env: INSTANCE=v3002-py3-centos-8-3002-5-py3 - - env: INSTANCE=v3002-py3-centos-7-3002-5-py3 - - env: INSTANCE=v3002-py3-fedora-33-3002-5-py3 - # - env: INSTANCE=v3002-py3-fedora-32-3002-5-py3 - - env: INSTANCE=v3002-py3-amazonlinux-2-3002-5-py3 - - env: INSTANCE=v3002-py3-oraclelinux-8-3002-5-py3 - - env: INSTANCE=v3002-py3-oraclelinux-7-3002-5-py3 - - env: INSTANCE=v3002-py3-arch-base-latest-3002-5-py3 - - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-5-py3 - - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-5-py3 - - env: INSTANCE=v3001-py3-debian-10-3001-6-py3 - # - env: INSTANCE=v3001-py3-debian-9-3001-6-py3 - - env: INSTANCE=v3001-py3-ubuntu-2004-3001-6-py3 - # - env: INSTANCE=v3001-py3-ubuntu-1804-3001-6-py3 - # - env: INSTANCE=v3001-py3-ubuntu-1604-3001-6-py3 - - env: INSTANCE=v3001-py3-centos-8-3001-6-py3 - # - env: INSTANCE=v3001-py3-centos-7-3001-6-py3 - # - env: INSTANCE=v3001-py3-fedora-33-3001-6-py3 - - env: INSTANCE=v3001-py3-fedora-32-3001-6-py3 - # - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-6-py3 - # - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-6-py3 - # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-6-py3 - - env: INSTANCE=v3001-py3-oraclelinux-8-3001-6-py3 - # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-6-py3 - # - env: INSTANCE=v3001-py3-arch-base-latest-3001-6-py3 - # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-6-py3 - # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-6-py3 - # - env: INSTANCE=v3000-py3-debian-10-3000-8-py3 - - env: INSTANCE=v3000-py3-debian-9-3000-8-py3 - - env: INSTANCE=v3000-py3-ubuntu-1804-3000-8-py3 - # - env: INSTANCE=v3000-py3-ubuntu-1604-3000-8-py3 - # - env: INSTANCE=v3000-py3-centos-8-3000-8-py3 - - env: INSTANCE=v3000-py3-centos-7-3000-8-py3 - # - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-8-py3 - # - env: INSTANCE=v3000-py3-amazonlinux-2-3000-8-py3 - # - env: INSTANCE=v3000-py3-oraclelinux-8-3000-8-py3 - - env: INSTANCE=v3000-py3-oraclelinux-7-3000-8-py3 - # - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-8-py3 - # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-8-py3 - # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-8-py2 - - env: INSTANCE=v3000-py2-ubuntu-1604-3000-8-py2 - # - env: INSTANCE=v3000-py2-arch-base-latest-3000-8-py2 + - env: INSTANCE=v3003-py3-debian-10-3003-0-py3 + # - env: INSTANCE=v3003-py3-debian-9-3003-0-py3 + - env: INSTANCE=v3003-py3-ubuntu-2004-3003-0-py3 + # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-0-py3 + - env: INSTANCE=v3003-py3-centos-8-3003-0-py3 + # - env: INSTANCE=v3003-py3-centos-7-3003-0-py3 + # - env: INSTANCE=v3003-py3-fedora-34-3003-0-py3 + # - env: INSTANCE=v3003-py3-fedora-33-3003-0-py3 + # - env: INSTANCE=v3003-py3-fedora-32-3003-0-py3 + - env: INSTANCE=v3003-py3-amazonlinux-2-3003-0-py3 + - env: INSTANCE=v3003-py3-oraclelinux-8-3003-0-py3 + # - env: INSTANCE=v3003-py3-oraclelinux-7-3003-0-py3 + - env: INSTANCE=v3003-py3-arch-base-latest-3003-0-py3 + - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-0-py3 + - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-0-py3 + # - env: INSTANCE=v3002-py3-debian-10-3002-6-py3 + - env: INSTANCE=v3002-py3-debian-9-3002-6-py3 + # - env: INSTANCE=v3002-py3-ubuntu-2004-3002-6-py3 + - env: INSTANCE=v3002-py3-ubuntu-1804-3002-6-py3 + # - env: INSTANCE=v3002-py3-ubuntu-1604-3002-6-py3 + # - env: INSTANCE=v3002-py3-centos-8-3002-6-py3 + - env: INSTANCE=v3002-py3-centos-7-3002-6-py3 + - env: INSTANCE=v3002-py3-fedora-34-3002-6-py3 + - env: INSTANCE=v3002-py3-fedora-33-3002-6-py3 + # - env: INSTANCE=v3002-py3-fedora-32-3002-6-py3 + - env: INSTANCE=v3002-py3-amazonlinux-2-3002-6-py3 + # - env: INSTANCE=v3002-py3-oraclelinux-8-3002-6-py3 + - env: INSTANCE=v3002-py3-oraclelinux-7-3002-6-py3 + # - env: INSTANCE=v3002-py3-arch-base-latest-3002-6-py3 + # - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-5-py3 + # - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-5-py3 + - env: INSTANCE=v3002-py3-opensuse-leap-152-3002-2-py3 + - env: INSTANCE=v3002-py3-opensuse-tmbl-latest-3002-2-py3 + - env: INSTANCE=v3001-py3-debian-10-3001-7-py3 + # - env: INSTANCE=v3001-py3-debian-9-3001-7-py3 + - env: INSTANCE=v3001-py3-ubuntu-2004-3001-7-py3 + # - env: INSTANCE=v3001-py3-ubuntu-1804-3001-7-py3 + # - env: INSTANCE=v3001-py3-ubuntu-1604-3001-7-py3 + - env: INSTANCE=v3001-py3-centos-8-3001-7-py3 + # - env: INSTANCE=v3001-py3-centos-7-3001-7-py3 + # - env: INSTANCE=v3001-py3-fedora-34-3001-7-py3 + # - env: INSTANCE=v3001-py3-fedora-33-3001-7-py3 + - env: INSTANCE=v3001-py3-fedora-32-3001-7-py3 + # - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-7-py3 + # - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-7-py3 + # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-7-py3 + - env: INSTANCE=v3001-py3-oraclelinux-8-3001-7-py3 + # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-7-py3 + # - env: INSTANCE=v3001-py3-arch-base-latest-3001-7-py3 + # - env: INSTANCE=v3000-py3-debian-10-3000-9-py3 + - env: INSTANCE=v3000-py3-debian-9-3000-9-py3 + - env: INSTANCE=v3000-py3-ubuntu-1804-3000-9-py3 + # - env: INSTANCE=v3000-py3-ubuntu-1604-3000-9-py3 + # - env: INSTANCE=v3000-py3-centos-8-3000-9-py3 + - env: INSTANCE=v3000-py3-centos-7-3000-9-py3 + # - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-9-py3 + # - env: INSTANCE=v3000-py3-amazonlinux-2-3000-9-py3 + # - env: INSTANCE=v3000-py3-oraclelinux-8-3000-9-py3 + - env: INSTANCE=v3000-py3-oraclelinux-7-3000-9-py3 + # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-9-py2 + - env: INSTANCE=v3000-py2-ubuntu-1604-3000-9-py2 + # - env: INSTANCE=v3000-py2-arch-base-latest-3000-9-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index f13280a..1d44068 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -18,6 +18,16 @@ driver: <% end %> platforms: + - name: freebsd-130-master-py3 + driver: + box: myii/freebsd-13.0-master-py3 + synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 + - name: freebsd-122-master-py3 + driver: + box: myii/freebsd-12.2-master-py3 + - name: freebsd-114-master-py3 + driver: + box: myii/freebsd-11.4-master-py3 - name: freebsd-130-3002-6-py3 driver: box: myii/freebsd-13.0-3002.6-py3 diff --git a/kitchen.windows.yml b/kitchen.windows.yml index 7c3cc6f..397c9b0 100644 --- a/kitchen.windows.yml +++ b/kitchen.windows.yml @@ -15,7 +15,7 @@ platforms: provisioner: salt_install: bootstrap - salt_bootstrap_options: -pythonVersion 3 -version 3002.5 + salt_bootstrap_options: -pythonVersion 3 -version 3003 # yamllint disable rule:line-length init_environment: | C:\salt\salt-call --local state.single file.managed ` diff --git a/kitchen.yml b/kitchen.yml index e103d63..6e322bf 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -63,6 +63,9 @@ platforms: - name: centos-7-master-py3 driver: image: saltimages/salt-master-py3:centos-7 + - name: fedora-34-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-34 - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 @@ -102,47 +105,101 @@ platforms: driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd - ## SALT `3002.5` - - name: debian-10-3002-5-py3 + ## SALT `3003.0` + - name: debian-10-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-10 - - name: debian-9-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-10 + - name: debian-9-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-9 - - name: ubuntu-2004-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-9 + - name: ubuntu-2004-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-18.04 + - name: centos-8-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-16.04 - - name: centos-8-3002-5-py3 + image: saltimages/salt-3003.0-py3:centos-8 + - name: centos-7-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:centos-8 - - name: centos-7-3002-5-py3 + image: saltimages/salt-3003.0-py3:centos-7 + - name: fedora-34-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:centos-7 - - name: fedora-33-3002-5-py3 + image: saltimages/salt-3003.0-py3:fedora-34 + - name: fedora-33-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:fedora-33 - - name: fedora-32-3002-5-py3 + image: saltimages/salt-3003.0-py3:fedora-33 + - name: fedora-32-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:fedora-32 - - name: amazonlinux-2-3002-5-py3 + image: saltimages/salt-3003.0-py3:fedora-32 + - name: amazonlinux-2-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:amazonlinux-2 - - name: oraclelinux-8-3002-5-py3 + image: saltimages/salt-3003.0-py3:amazonlinux-2 + - name: oraclelinux-8-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-8 - - name: oraclelinux-7-3002-5-py3 + image: saltimages/salt-3003.0-py3:oraclelinux-8 + - name: oraclelinux-7-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-7 - - name: arch-base-latest-3002-5-py3 + image: saltimages/salt-3003.0-py3:oraclelinux-7 + - name: arch-base-latest-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:arch-base-latest + image: saltimages/salt-3003.0-py3:arch-base-latest run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd + + ## SALT `3002.6` + - name: debian-10-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-10 + - name: debian-9-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-9 + - name: ubuntu-2004-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-16.04 + - name: centos-8-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:centos-8 + - name: centos-7-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:centos-7 + - name: fedora-34-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:fedora-34 + - name: fedora-33-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:fedora-33 + - name: fedora-32-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:fedora-32 + - name: amazonlinux-2-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:amazonlinux-2 + - name: oraclelinux-8-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:oraclelinux-8 + - name: oraclelinux-7-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:oraclelinux-7 + - name: arch-base-latest-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd + + ## SALT `3002.5` - name: gentoo-stage3-latest-3002-5-py3 driver: image: saltimages/salt-3002.5-py3:gentoo-stage3-latest @@ -169,63 +226,68 @@ platforms: transport: max_ssh_sessions: 1 - ## SALT `3001.6` - - name: debian-10-3001-6-py3 + ## SALT `3001.7` + - name: debian-10-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-10 - - name: debian-9-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-10 + - name: debian-9-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-9 - - name: ubuntu-2004-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-9 + - name: ubuntu-2004-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-16.04 - - name: centos-8-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-16.04 + - name: centos-8-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:centos-8 - - name: centos-7-3001-6-py3 + image: saltimages/salt-3001.7-py3:centos-8 + - name: centos-7-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:centos-7 - - name: fedora-33-3001-6-py3 + image: saltimages/salt-3001.7-py3:centos-7 + - name: fedora-34-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:fedora-33 - - name: fedora-32-3001-6-py3 + image: saltimages/salt-3001.7-py3:fedora-34 + - name: fedora-33-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:fedora-32 - - name: opensuse-leap-152-3001-6-py3 + image: saltimages/salt-3001.7-py3:fedora-33 + - name: fedora-32-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:opensuse-leap-15.2 + image: saltimages/salt-3001.7-py3:fedora-32 + - name: opensuse-leap-152-3001-7-py3 + driver: + image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3001-6-py3 + - name: opensuse-tmbl-latest-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3001-6-py3 + - name: amazonlinux-2-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:amazonlinux-2 - - name: oraclelinux-8-3001-6-py3 + image: saltimages/salt-3001.7-py3:amazonlinux-2 + - name: oraclelinux-8-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:oraclelinux-8 - - name: oraclelinux-7-3001-6-py3 + image: saltimages/salt-3001.7-py3:oraclelinux-8 + - name: oraclelinux-7-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:oraclelinux-7 - - name: arch-base-latest-3001-6-py3 + image: saltimages/salt-3001.7-py3:oraclelinux-7 + - name: arch-base-latest-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:arch-base-latest + image: saltimages/salt-3001.7-py3:arch-base-latest run_command: /usr/lib/systemd/systemd + + ## SALT `3001.6` - name: gentoo-stage3-latest-3001-6-py3 driver: image: saltimages/salt-3001.6-py3:gentoo-stage3-latest @@ -234,42 +296,54 @@ platforms: driver: image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd - ## SALT `3000.8` - - name: debian-10-3000-8-py3 + ## SALT `3000.9` + - name: debian-10-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-10 - - name: debian-9-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-10 + - name: debian-9-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-9 - - name: ubuntu-1804-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-9 + - name: ubuntu-1804-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-16.04 - - name: centos-8-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-16.04 + - name: centos-8-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:centos-8 - - name: centos-7-3000-8-py3 + image: saltimages/salt-3000.9-py3:centos-8 + - name: centos-7-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:centos-7 - - name: opensuse-leap-152-3000-8-py3 + image: saltimages/salt-3000.9-py3:centos-7 + - name: opensuse-leap-152-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:opensuse-leap-15.2 + image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3000-8-py3 + - name: amazonlinux-2-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:amazonlinux-2 - - name: oraclelinux-8-3000-8-py3 + image: saltimages/salt-3000.9-py3:amazonlinux-2 + - name: oraclelinux-8-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:oraclelinux-8 - - name: oraclelinux-7-3000-8-py3 + image: saltimages/salt-3000.9-py3:oraclelinux-8 + - name: oraclelinux-7-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:oraclelinux-7 + image: saltimages/salt-3000.9-py3:oraclelinux-7 + - name: ubuntu-1804-3000-9-py2 + driver: + image: saltimages/salt-3000.9-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py2 + driver: + image: saltimages/salt-3000.9-py2:ubuntu-16.04 + - name: arch-base-latest-3000-9-py2 + driver: + image: saltimages/salt-3000.9-py2:arch-base-latest + run_command: /usr/lib/systemd/systemd + + ## SALT `3000.8` - name: gentoo-stage3-latest-3000-8-py3 driver: image: saltimages/salt-3000.8-py3:gentoo-stage3-latest @@ -277,16 +351,6 @@ platforms: - name: gentoo-stage3-systemd-3000-8-py3 driver: image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd - - name: ubuntu-1804-3000-8-py2 - driver: - image: saltimages/salt-3000.8-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py2 - driver: - image: saltimages/salt-3000.8-py2:ubuntu-16.04 - - name: arch-base-latest-3000-8-py2 - driver: - image: saltimages/salt-3000.8-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd provisioner: name: salt_solo @@ -307,30 +371,70 @@ verifier: - cli suites: - - name: v3002-py3 + - name: v3003-py3 includes: - - debian-10-3002-5-py3 - - debian-9-3002-5-py3 - - ubuntu-2004-3002-5-py3 - - ubuntu-1804-3002-5-py3 - - ubuntu-1604-3002-5-py3 - - centos-8-3002-5-py3 - - centos-7-3002-5-py3 - - fedora-33-3002-5-py3 - - fedora-32-3002-5-py3 - - amazonlinux-2-3002-5-py3 - - oraclelinux-8-3002-5-py3 - - oraclelinux-7-3002-5-py3 - - arch-base-latest-3002-5-py3 - - gentoo-stage3-latest-3002-5-py3 - - gentoo-stage3-systemd-3002-5-py3 - - freebsd-130-3002-6-py3 - - freebsd-122-3002-6-py3 - - freebsd-114-3002-6-py3 + - debian-10-3003-0-py3 + - debian-9-3003-0-py3 + - ubuntu-2004-3003-0-py3 + - ubuntu-1804-3003-0-py3 + - centos-8-3003-0-py3 + - centos-7-3003-0-py3 + - fedora-34-3003-0-py3 + - fedora-33-3003-0-py3 + - fedora-32-3003-0-py3 + - amazonlinux-2-3003-0-py3 + - oraclelinux-8-3003-0-py3 + - oraclelinux-7-3003-0-py3 + - arch-base-latest-3003-0-py3 + - gentoo-stage3-latest-3003-0-py3 + - gentoo-stage3-systemd-3003-0-py3 - windows-10-latest-py3 - windows-81-latest-py3 - windows-2019-latest-py3 - windows-2016-latest-py3 + provisioner: + state_top: + base: + '*': + - salt._mapdata + - 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-10-3002-6-py3 + - debian-9-3002-6-py3 + - ubuntu-2004-3002-6-py3 + - ubuntu-1804-3002-6-py3 + - ubuntu-1604-3002-6-py3 + - centos-8-3002-6-py3 + - centos-7-3002-6-py3 + - fedora-34-3002-6-py3 + - fedora-33-3002-6-py3 + - fedora-32-3002-6-py3 + - amazonlinux-2-3002-6-py3 + - oraclelinux-8-3002-6-py3 + - oraclelinux-7-3002-6-py3 + - arch-base-latest-3002-6-py3 + - gentoo-stage3-latest-3002-5-py3 + - gentoo-stage3-systemd-3002-5-py3 + - opensuse-leap-152-3002-2-py3 + - opensuse-tmbl-latest-3002-2-py3 + - freebsd-130-3002-6-py3 + - freebsd-122-3002-6-py3 + - freebsd-114-3002-6-py3 provisioner: state_top: base: @@ -353,23 +457,22 @@ suites: - path: test/integration/v3002-py3 - name: v3001-py3 includes: - - debian-10-3001-6-py3 - - debian-9-3001-6-py3 - - ubuntu-2004-3001-6-py3 - - ubuntu-1804-3001-6-py3 - - ubuntu-1604-3001-6-py3 - - centos-8-3001-6-py3 - - centos-7-3001-6-py3 - - fedora-33-3001-6-py3 - - fedora-32-3001-6-py3 - - opensuse-leap-152-3001-6-py3 - - opensuse-tmbl-latest-3001-6-py3 - - amazonlinux-2-3001-6-py3 - - oraclelinux-8-3001-6-py3 - - oraclelinux-7-3001-6-py3 - - arch-base-latest-3001-6-py3 - - gentoo-stage3-latest-3001-6-py3 - - gentoo-stage3-systemd-3001-6-py3 + - debian-10-3001-7-py3 + - debian-9-3001-7-py3 + - ubuntu-2004-3001-7-py3 + - ubuntu-1804-3001-7-py3 + - ubuntu-1604-3001-7-py3 + - centos-8-3001-7-py3 + - centos-7-3001-7-py3 + - fedora-34-3001-7-py3 + - fedora-33-3001-7-py3 + - fedora-32-3001-7-py3 + - opensuse-leap-152-3001-7-py3 + - opensuse-tmbl-latest-3001-7-py3 + - amazonlinux-2-3001-7-py3 + - oraclelinux-8-3001-7-py3 + - oraclelinux-7-3001-7-py3 + - arch-base-latest-3001-7-py3 - openbsd-68-3001-1-py3 provisioner: state_top: @@ -393,18 +496,16 @@ suites: - path: test/integration/v3001-py3 - name: v3000-py3 includes: - - debian-10-3000-8-py3 - - debian-9-3000-8-py3 - - ubuntu-1804-3000-8-py3 - - ubuntu-1604-3000-8-py3 - - centos-8-3000-8-py3 - - centos-7-3000-8-py3 - - opensuse-leap-152-3000-8-py3 - - amazonlinux-2-3000-8-py3 - - oraclelinux-8-3000-8-py3 - - oraclelinux-7-3000-8-py3 - - gentoo-stage3-latest-3000-8-py3 - - gentoo-stage3-systemd-3000-8-py3 + - debian-10-3000-9-py3 + - debian-9-3000-9-py3 + - ubuntu-1804-3000-9-py3 + - ubuntu-1604-3000-9-py3 + - centos-8-3000-9-py3 + - centos-7-3000-9-py3 + - opensuse-leap-152-3000-9-py3 + - amazonlinux-2-3000-9-py3 + - oraclelinux-8-3000-9-py3 + - oraclelinux-7-3000-9-py3 provisioner: state_top: base: @@ -427,9 +528,9 @@ suites: - path: test/integration/v3000-py3 - name: v3000-py2 includes: - - ubuntu-1804-3000-8-py2 - - ubuntu-1604-3000-8-py2 - - arch-base-latest-3000-8-py2 + - ubuntu-1804-3000-9-py2 + - ubuntu-1604-3000-9-py2 + - arch-base-latest-3000-9-py2 provisioner: state_top: base: diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml new file mode 100644 index 0000000..b426e47 --- /dev/null +++ b/test/integration/v3002-py3/files/_mapdata/fedora-34.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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/v3003-py3/README.md b/test/integration/v3003-py3/README.md new file mode 100644 index 0000000..49080dd --- /dev/null +++ b/test/integration/v3003-py3/README.md @@ -0,0 +1,50 @@ +# 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 new file mode 100644 index 0000000..b2b0541 --- /dev/null +++ b/test/integration/v3003-py3/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/v3003-py3/controls/pkgs_spec.rb b/test/integration/v3003-py3/controls/pkgs_spec.rb new file mode 100644 index 0000000..f847a2e --- /dev/null +++ b/test/integration/v3003-py3/controls/pkgs_spec.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +pkgs = + case system.platform[:name] + when 'arch' + %w[salt] + when /bsd$/ + %w[py37-salt] + when 'windows' + %w[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 new file mode 100644 index 0000000..be3dab7 --- /dev/null +++ b/test/integration/v3003-py3/controls/service_spec.rb @@ -0,0 +1,23 @@ +# 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/amazonlinux-2.yaml b/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml new file mode 100644 index 0000000..e5db645 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/amazonlinux-2.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/py3/amazon/2/$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: true + 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.saltstack.com/py3/amazon/2/$basearch/3003 + 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: '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/arch-base-latest.yaml b/test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml new file mode 100644 index 0000000..f88f990 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/arch-base-latest.yaml @@ -0,0 +1,114 @@ +# 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: true + 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: '3003' + 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/v3003-py3/files/_mapdata/centos-7.yaml b/test/integration/v3003-py3/files/_mapdata/centos-7.yaml new file mode 100644 index 0000000..93d9b65 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/centos-7.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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/centos-8.yaml b/test/integration/v3003-py3/files/_mapdata/centos-8.yaml new file mode 100644 index 0000000..d3e5c6a --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/centos-8.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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 new file mode 100644 index 0000000..57a9c7a --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/debian-10.yaml @@ -0,0 +1,114 @@ +# 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.saltstack.com/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: true + 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 https://repo.saltstack.com/py3/debian/10/amd64/3003 buster main + 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 new file mode 100644 index 0000000..67b65ad --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/debian-9.yaml @@ -0,0 +1,114 @@ +# 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.saltstack.com/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: true + 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 https://repo.saltstack.com/py3/debian/9/amd64/3003 stretch main + 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 new file mode 100644 index 0000000..2d46d02 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/fedora-32.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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/fedora-33.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml new file mode 100644 index 0000000..de0600f --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/fedora-33.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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/fedora-34.yaml b/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml new file mode 100644 index 0000000..75f7b67 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/fedora-34.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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 new file mode 100644 index 0000000..8c6a7e0 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml @@ -0,0 +1,112 @@ +# 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: true + 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: py37-pygit2 + python_dulwich: py37-dulwich + python_git: py37-GitPython + release: '3003' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: wheel + rootuser: root + salt_api: py37-salt + salt_cloud: py37-salt + salt_master: py37-salt + salt_master_macos_plist_hash: '' + salt_minion: py37-salt + salt_minion_macos_plist_hash: '' + salt_ssh: py37-salt + salt_syndic: py37-salt + ssh_roster: {} + syndic_service: salt_syndic + use_pip: false + version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml new file mode 100644 index 0000000..521af91 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml @@ -0,0 +1,112 @@ +# 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: true + 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: py37-pygit2 + python_dulwich: py37-dulwich + python_git: py37-GitPython + release: '3003' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: wheel + rootuser: root + salt_api: py37-salt + salt_cloud: py37-salt + salt_master: py37-salt + salt_master_macos_plist_hash: '' + salt_minion: py37-salt + salt_minion_macos_plist_hash: '' + salt_ssh: py37-salt + salt_syndic: py37-salt + ssh_roster: {} + syndic_service: salt_syndic + use_pip: false + version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml new file mode 100644 index 0000000..0a99e08 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml @@ -0,0 +1,112 @@ +# 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: true + 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: py37-pygit2 + python_dulwich: py37-dulwich + python_git: py37-GitPython + release: '3003' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: wheel + rootuser: root + salt_api: py37-salt + salt_cloud: py37-salt + salt_master: py37-salt + salt_master_macos_plist_hash: '' + salt_minion: py37-salt + salt_minion_macos_plist_hash: '' + salt_ssh: py37-salt + salt_syndic: py37-salt + ssh_roster: {} + syndic_service: salt_syndic + use_pip: false + version: '' diff --git a/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml new file mode 100644 index 0000000..b5cbfc5 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysd.yaml @@ -0,0 +1,112 @@ +# 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: true + 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: '3003' + 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/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml new file mode 100644 index 0000000..b5cbfc5 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/gentoo-2-sysv.yaml @@ -0,0 +1,112 @@ +# 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: true + 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: '3003' + 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/v3003-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml new file mode 100644 index 0000000..73c5c5c --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/opensuse-15.yaml @@ -0,0 +1,115 @@ +# 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: true + 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: '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/opensuse-tumbleweed.yaml b/test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml new file mode 100644 index 0000000..c7c1b23 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/opensuse-tumbleweed.yaml @@ -0,0 +1,115 @@ +# 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: true + 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: '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/oraclelinux-7.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml new file mode 100644 index 0000000..c8e1af8 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/oraclelinux-7.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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/oraclelinux-8.yaml b/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml new file mode 100644 index 0000000..e7717aa --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/oraclelinux-8.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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.saltstack.com/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/ubuntu-18.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml new file mode 100644 index 0000000..7dfb6d0 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/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: true + 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 https://repo.saltstack.com/py3/ubuntu/18.04/amd64/3003 bionic main + 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/files/_mapdata/ubuntu-20.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml new file mode 100644 index 0000000..ef32d9d --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml @@ -0,0 +1,115 @@ +# 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.saltstack.com/py3/ubuntu/20.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: true + 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 https://repo.saltstack.com/py3/ubuntu/20.04/amd64/3003 focal main + 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/files/_mapdata/windows-10.yaml b/test/integration/v3003-py3/files/_mapdata/windows-10.yaml new file mode 100644 index 0000000..75e8fd1 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/windows-10.yaml @@ -0,0 +1,111 @@ +# 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: true + 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: '3003' + 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/v3003-py3/files/_mapdata/windows-2016-server.yaml b/test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml new file mode 100644 index 0000000..122f6d6 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/windows-2016-server.yaml @@ -0,0 +1,111 @@ +# 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: true + 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: '3003' + 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/v3003-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml new file mode 100644 index 0000000..6369515 --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/windows-2019-server.yaml @@ -0,0 +1,111 @@ +# 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: true + 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: '3003' + 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/v3003-py3/files/_mapdata/windows-8.yaml b/test/integration/v3003-py3/files/_mapdata/windows-8.yaml new file mode 100644 index 0000000..8eaaf3a --- /dev/null +++ b/test/integration/v3003-py3/files/_mapdata/windows-8.yaml @@ -0,0 +1,111 @@ +# 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: true + 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: '3003' + 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/v3003-py3/inspec.yml b/test/integration/v3003-py3/inspec.yml new file mode 100644 index 0000000..e048343 --- /dev/null +++ b/test/integration/v3003-py3/inspec.yml @@ -0,0 +1,25 @@ +# -*- 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: windows diff --git a/test/salt/pillar/v3003-py3.sls b/test/salt/pillar/v3003-py3.sls new file mode 100644 index 0000000..f97a266 --- /dev/null +++ b/test/salt/pillar/v3003-py3.sls @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +salt: + release: '3003' + py_ver: 'py3' + + # Override used for FreeBSD minion service + retry_options: + attempts: 5 + until: true + interval: 10 + splay: 10