ci: standardise structure [skip ci]

* Automated using myii/ssf-formula#336
saltstack-formulas · Jul 4, 2021 · 650f5e4 · 650f5e4
1 parent 2cb7f56
commit 650f5e4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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