X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/ba5e37ebc18049d4340388fc0c19dcb2a78d6a86..e3ad2e8:/kitchen.yml

diff --git a/kitchen.yml b/kitchen.yml
index 0a9c7ab..53f989b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -39,10 +39,6 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
 
-  - name: amazonlinux-2-3001-py3
-    driver:
-      image: saltimages/salt-3001-py3:amazonlinux-2
-
   ## SALT `3001`
   - name: debian-10-3001-py3
     driver:
@@ -59,6 +55,9 @@ platforms:
   - name: centos-7-3001-py3
     driver:
       image: saltimages/salt-3001-py3:centos-7
+  - name: amazonlinux-2-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:amazonlinux-2
 
   ## SALT `3000.3`
   - name: debian-10-3000-3-py3
@@ -104,15 +103,14 @@ suites:
       state_top:
         base:
           '*':
-            - example_add_snakeoil_certs
+            - single_host.host_entries
+            - single_host.snakeoil_certs
             - locale
             - nginx.passenger
             - postgres
             - arvados.repo
             - arvados.api
             - arvados.websocket
-            # keepproxy complains when using snakeoil certs, so we can't
-            # properly test it here until next version removes this limitation
             - arvados.keepproxy
             - arvados.keepweb
             - arvados.controller
@@ -145,8 +143,8 @@ suites:
         example_nginx_controller.sls: test/salt/pillar/examples/nginx_controller_configuration.sls
         # yamllint enable rule:line-length
       dependencies:
-        - name: example_add_snakeoil_certs
-          path: test/salt/states
+        - name: single_host
+          path: test/salt/states/examples
         - name: locale
           repo: git
           source: https://github.com/saltstack-formulas/locale-formula.git
@@ -172,7 +170,8 @@ suites:
       state_top:
         base:
           '*':
-            - example_add_snakeoil_certs
+            - single_host.host_entries
+            - single_host.snakeoil_certs
             - nginx.passenger
             - arvados.repo
             - arvados.workbench
@@ -193,8 +192,8 @@ suites:
         example_nginx_workbench2.sls: test/salt/pillar/examples/nginx_workbench2_configuration.sls
         # yamllint enable rule:line-length
       dependencies:
-        - name: example_add_snakeoil_certs
-          path: test/salt/states
+        - name: single_host
+          path: test/salt/states/examples
         - name: nginx
           repo: git
           source: https://github.com/netmanagers/nginx-formula.git