projects / arvados-formula.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix(config): ensure AnonymousUserToken is set
[arvados-formula.git] / kitchen.yml
diff --git a/kitchen.yml b/kitchen.yml
index 37ed50b19106e9c3e3c0ed1827a676804f1cda2d..cb3531930e8153f2ad7bfd575c497f2f6279a52e 100644 (file)
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -73,104 +73,133 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:oraclelinux-7
 
-  ## 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: amazonlinux-2-3003-0-py3
     driver:
-      image: saltimages/salt-3002.5-py3:centos-7
-  - name: amazonlinux-2-3002-5-py3
+      image: saltimages/salt-3003.0-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-0-py3
     driver:
-      image: saltimages/salt-3002.5-py3:amazonlinux-2
-  - name: oraclelinux-8-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-8
-  - name: oraclelinux-7-3002-5-py3
+      image: saltimages/salt-3003.0-py3:oraclelinux-7
+
+  ## 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.5-py3:oraclelinux-7
+      image: saltimages/salt-3002.6-py3:centos-7
+  - 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
 
-  ## 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: amazonlinux-2-3001-6-py3
+      image: saltimages/salt-3001.7-py3:centos-7
+  - 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
+      image: saltimages/salt-3001.7-py3:oraclelinux-7
 
-  ## 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: amazonlinux-2-3000-8-py3
+      image: saltimages/salt-3000.9-py3:centos-7
+  - 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
-  - name: ubuntu-1804-3000-8-py2
+      image: saltimages/salt-3000.9-py3:oraclelinux-7
+  - name: ubuntu-1804-3000-9-py2
     driver:
-      image: saltimages/salt-3000.8-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-8-py2
+      image: saltimages/salt-3000.9-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-9-py2
     driver:
-      image: saltimages/salt-3000.8-py2:ubuntu-16.04
+      image: saltimages/salt-3000.9-py2:ubuntu-16.04
 
 provisioner:
   name: salt_solo
@@ -207,10 +236,11 @@ suites:
           source: https://github.com/saltstack-formulas/postgres-formula.git
         - name: nginx
           repo: git
-          source: https://github.com/netmanagers/nginx-formula.git
+          source: https://github.com/saltstack-formulas/nginx-formula.git
       state_top:
         base:
           '*':
+            - arvados._mapdata
             - single_host.host_entries
             - single_host.snakeoil_certs
             - locale
@@ -267,10 +297,11 @@ suites:
           path: test/salt/states/examples
         - name: nginx
           repo: git
-          source: https://github.com/netmanagers/nginx-formula.git
+          source: https://github.com/saltstack-formulas/nginx-formula.git
       state_top:
         base:
           '*':
+            - arvados._mapdata
             - single_host.host_entries
             - single_host.snakeoil_certs
             - nginx.passenger
@@ -294,6 +325,7 @@ suites:
         # yamllint enable rule:line-length
     verifier:
       inspec_tests:
+        - path: test/integration/repo
         - path: test/integration/workbench
         - path: test/integration/workbench2
   #### shell
@@ -304,6 +336,7 @@ suites:
       state_top:
         base:
           '*':
+            - arvados._mapdata
             # We also test repo here. No sense for a whole separate suite
             - arvados.repo
             - arvados.shell
@@ -325,17 +358,16 @@ suites:
       state_top:
         base:
           '*':
+            - arvados._mapdata
             - arvados.repo
             - arvados.keepstore
-            # - arvados.clean
       pillars:
         top.sls:
           base:
             '*':
               - arvados
       pillars_from_files:
-        arvados.sls: test/salt/pillar/arvados.sls
+        arvados.sls: test/salt/pillar/arvados_dev.sls
     verifier:
       inspec_tests:
-        - path: test/integration/repo
         - path: test/integration/keepstore