Merge branch '18631-shell-login-sync'
[arvados-formula.git] / kitchen.yml
index d0ee227eb94bbfcf654cc3d9a8e4123a964d2039..0b3dcd6285915d214fbb9f9efcf73a22a4d42e1f 100644 (file)
@@ -12,136 +12,98 @@ driver:
   privileged: true
   run_command: /lib/systemd/systemd
 
   privileged: true
   run_command: /lib/systemd/systemd
 
+provisioner:
+  name: salt_solo
+  log_level: debug
+  salt_install: none
+  require_chef: false
+  formula: arvados
+  salt_copy_filter:
+    - .kitchen
+    - .git
+
 platforms:
   ## SALT `tiamat`
 platforms:
   ## SALT `tiamat`
+  - name: debian-11-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-11
   - name: debian-10-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:debian-10
   - name: debian-10-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:debian-10
-  - name: debian-9-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-9
   - name: ubuntu-2004-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-20.04
   - name: ubuntu-1804-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
   - name: ubuntu-2004-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-20.04
   - name: ubuntu-1804-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
-  - name: ubuntu-1604-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-16.04
   - name: centos-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-7
 
   ## SALT `master`
   - name: centos-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-7
 
   ## SALT `master`
+  - name: debian-11-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-11
   - name: debian-10-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-10
   - name: debian-10-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-10
-  - name: debian-9-master-py3
-    driver:
-      image: saltimages/salt-master-py3:debian-9
   - name: ubuntu-2004-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-20.04
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
   - name: ubuntu-2004-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-20.04
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
-  - name: ubuntu-1604-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-16.04
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
 
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
 
-  ## SALT `3003.1`
-  - name: debian-10-3003-1-py3
+  ## SALT `3004.1`
+  - name: debian-11-3004.1-py3
     driver:
     driver:
-      image: saltimages/salt-3003.1-py3:debian-10
-  - name: debian-9-3003-1-py3
+      image: saltimages/salt-3004.1-py3:debian-11
+  - name: debian-10-3004.1-py3
     driver:
     driver:
-      image: saltimages/salt-3003.1-py3:debian-9
-  - name: ubuntu-2004-3003-1-py3
+      image: saltimages/salt-3004.1-py3:debian-10
+  - name: ubuntu-2004-3004.1-py3
     driver:
     driver:
-      image: saltimages/salt-3003.1-py3:ubuntu-20.04
-  - name: ubuntu-1804-3003-1-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
+  - name: ubuntu-1804-3004.1-py3
     driver:
     driver:
-      image: saltimages/salt-3003.1-py3:ubuntu-18.04
-  - name: centos-7-3003-1-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
+  - name: centos-7-3004.1-py3
     driver:
     driver:
-      image: saltimages/salt-3003.1-py3:centos-7
+      image: saltimages/salt-3004.1-py3:centos-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
+  ## SALT `3003.4`
+  - name: debian-11-3003.4-py3
     driver:
     driver:
-      image: saltimages/salt-3002.6-py3:debian-9
-  - name: ubuntu-2004-3002-6-py3
+      image: saltimages/salt-3003.4-py3:debian-11
+  - name: debian-10-3003.4-py3
     driver:
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002-6-py3
+      image: saltimages/salt-3003.4-py3:debian-10
+  - name: ubuntu-2004-3003.4-py3
     driver:
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-18.04
-  - name: ubuntu-1604-3002-6-py3
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003.4-py3
     driver:
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-16.04
-  - name: centos-7-3002-6-py3
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
+  - name: centos-7-3003.4-py3
     driver:
     driver:
-      image: saltimages/salt-3002.6-py3:centos-7
+      image: saltimages/salt-3003.4-py3:centos-7
 
 
-  ## SALT `3001.7`
-  - name: debian-10-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:debian-10
-  - name: debian-9-3001-7-py3
+  ## SALT `3002.8`
+  - name: debian-10-3002.8-py3
     driver:
     driver:
-      image: saltimages/salt-3001.7-py3:debian-9
-  - name: ubuntu-2004-3001-7-py3
+      image: saltimages/salt-3002.8-py3:debian-10
+  - name: ubuntu-2004-3002.8-py3
     driver:
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-7-py3
+      image: saltimages/salt-3002.8-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002.8-py3
     driver:
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-7-py3
+      image: saltimages/salt-3002.8-py3:ubuntu-18.04
+  - name: centos-7-3002.8-py3
     driver:
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-16.04
-  - name: centos-7-3001-7-py3
-    driver:
-      image: saltimages/salt-3001.7-py3:centos-7
-
-  ## SALT `3000.9`
-  - name: debian-10-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-10
-  - name: debian-9-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-9
-  - name: ubuntu-1804-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:ubuntu-18.04
-  - name: ubuntu-1604-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:ubuntu-16.04
-  - name: centos-7-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:centos-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
-
-provisioner:
-  name: salt_solo
-  log_level: debug
-  salt_install: none
-  require_chef: false
-  formula: arvados
-  salt_copy_filter:
-    - .kitchen
-    - .git
+      image: saltimages/salt-3002.8-py3:centos-7
 
 verifier:
   # https://www.inspec.io/
 
 verifier:
   # https://www.inspec.io/
@@ -173,11 +135,11 @@ suites:
         base:
           '*':
             - arvados._mapdata
         base:
           '*':
             - arvados._mapdata
-            - postgres
             - single_host.host_entries
             - single_host.snakeoil_certs
             - locale
             - nginx.passenger
             - single_host.host_entries
             - single_host.snakeoil_certs
             - locale
             - nginx.passenger
+            - postgres
             - arvados.repo
             - arvados.api
             - arvados.websocket
             - arvados.repo
             - arvados.api
             - arvados.websocket
@@ -185,6 +147,8 @@ suites:
             - arvados.keepweb
             - arvados.controller
             - arvados.dispatcher
             - arvados.keepweb
             - arvados.controller
             - arvados.dispatcher
+            - arvados.keepbalance
+            - arvados.shell.resources.virtual_machines
       pillars:
         top.sls:
           base:
       pillars:
         top.sls:
           base:
@@ -219,6 +183,7 @@ suites:
         - path: test/integration/keepproxy
         - path: test/integration/keepweb
         - path: test/integration/controller
         - path: test/integration/keepproxy
         - path: test/integration/keepweb
         - path: test/integration/controller
+        - path: test/integration/keepbalance
   #### workbench,workbench2,webshell
   - name: workbench
     driver:
   #### workbench,workbench2,webshell
   - name: workbench
     driver: