diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dcf638..18f0c09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,8 +124,10 @@ rubocop: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` # git-debian-10-tiamat-py3: {extends: '.test_instance'} +domains-debian-10-tiamat-py3: {extends: '.test_instance'} # git-debian-9-tiamat-py3: {extends: '.test_instance'} # git-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} +domains-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # git-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} # git-centos-8-tiamat-py3: {extends: '.test_instance'} # git-centos-7-tiamat-py3: {extends: '.test_instance'} @@ -136,10 +138,14 @@ rubocop: # git-rockylinux-8-tiamat-py3: {extends: '.test_instance'} # git-debian-10-master-py3: {extends: '.test_instance'} deb-debian-10-master-py3: {extends: '.test_instance'} +# domains-debian-10-master-py3: {extends: '.test_instance'} # git-debian-9-master-py3: {extends: '.test_instance'} deb-debian-9-master-py3: {extends: '.test_instance'} -# git-ubuntu-2004-master-py3: {extends: '.test_instance'} -# git-ubuntu-1804-master-py3: {extends: '.test_instance'} +# domains-debian-9-master-py3: {extends: '.test_instance'} +git-ubuntu-2004-master-py3: {extends: '.test_instance'} +# domains-ubuntu-2004-master-py3: {extends: '.test_instance'} +git-ubuntu-1804-master-py3: {extends: '.test_instance'} +# domains-ubuntu-1804-master-py3: {extends: '.test_instance'} # git-centos-8-master-py3: {extends: '.test_instance'} rpm-centos-8-master-py3: {extends: '.test_instance'} # git-centos-7-master-py3: {extends: '.test_instance'} @@ -229,7 +235,6 @@ rpm-rockylinux-8-master-py3: {extends: '.test_instance'} # git-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'} # git-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} # git-arch-base-latest-3000-9-py2: {extends: '.test_instance'} -domains-debian-10-3003-1-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 62dc1de..6a56379 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,8 +84,10 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` # - env: INSTANCE=git-debian-10-tiamat-py3 + - env: INSTANCE=domains-debian-10-tiamat-py3 # - env: INSTANCE=git-debian-9-tiamat-py3 # - env: INSTANCE=git-ubuntu-2004-tiamat-py3 + - env: INSTANCE=domains-ubuntu-2004-tiamat-py3 # - env: INSTANCE=git-ubuntu-1804-tiamat-py3 # - env: INSTANCE=git-centos-8-tiamat-py3 # - env: INSTANCE=git-centos-7-tiamat-py3 @@ -96,10 +98,14 @@ jobs: # - env: INSTANCE=git-rockylinux-8-tiamat-py3 # - env: INSTANCE=git-debian-10-master-py3 - env: INSTANCE=deb-debian-10-master-py3 + # - env: INSTANCE=domains-debian-10-master-py3 # - env: INSTANCE=git-debian-9-master-py3 - env: INSTANCE=deb-debian-9-master-py3 - # - env: INSTANCE=git-ubuntu-2004-master-py3 - # - env: INSTANCE=git-ubuntu-1804-master-py3 + # - env: INSTANCE=domains-debian-9-master-py3 + - env: INSTANCE=git-ubuntu-2004-master-py3 + # - env: INSTANCE=domains-ubuntu-2004-master-py3 + - env: INSTANCE=git-ubuntu-1804-master-py3 + # - env: INSTANCE=domains-ubuntu-1804-master-py3 # - env: INSTANCE=git-centos-8-master-py3 - env: INSTANCE=rpm-centos-8-master-py3 # - env: INSTANCE=git-centos-7-master-py3 diff --git a/kitchen.yml b/kitchen.yml index 5156f81..79bac86 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -528,12 +528,32 @@ suites: - path: test/integration/rpm - name: domains includes: + - debian-10-tiamat-py3 + - debian-9-tiamat-py3 + - ubuntu-2004-tiamat-py3 + - ubuntu-1804-tiamat-py3 + - debian-10-master-py3 + - debian-9-master-py3 + - ubuntu-2004-master-py3 + - ubuntu-1804-master-py3 - debian-10-3003-1-py3 + - debian-9-3003-1-py3 + - ubuntu-2004-3003-1-py3 + - ubuntu-1804-3003-1-py3 + - debian-10-3002-6-py3 + - debian-9-3002-6-py3 + - ubuntu-2004-3002-6-py3 + - ubuntu-1804-3002-6-py3 + - debian-10-3001-7-py3 + - debian-9-3001-7-py3 + - ubuntu-2004-3001-7-py3 + - ubuntu-1804-3001-7-py3 + - debian-10-3000-9-py3 + - debian-9-3000-9-py3 + - ubuntu-1804-3000-9-py3 + - ubuntu-1804-3000-9-py2 provisioner: dependencies: - - name: apt - repo: git - source: https://github.com/saltstack-formulas/apt-formula.git - name: states path: ./test/salt state_top: diff --git a/test/integration/domains/inspec.yml b/test/integration/domains/inspec.yml index f566fab..474880f 100644 --- a/test/integration/domains/inspec.yml +++ b/test/integration/domains/inspec.yml @@ -5,7 +5,7 @@ name: domains title: letsencrypt formula maintainer: SaltStack Formulas license: Apache-2.0 -summary: Verify that certificates can be requested/issued correctly +summary: Verify that certificates can be requested/issued correctly on Debian depends: - name: share path: test/integration/share