Merge branch '18631-shell-login-sync'

[arvados-formula.git] / kitchen.yml

diff --git a/kitchen.yml b/kitchen.yml
index b55392bb7d489ae5ca82a430066d246f0c9850c1..0b3dcd6285915d214fbb9f9efcf73a22a4d42e1f 100644 (file)
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 # -*- coding: utf-8 -*-
 # vim: ft=yaml

+
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0

 ---
 # For help on this file's format, see https://kitchen.ci/
 driver:
 ---
 # For help on this file's format, see https://kitchen.ci/
 driver:


@@ -8,16 +12,24 @@ driver:
   privileged: true
   run_command: /lib/systemd/systemd
 
   privileged: true
   run_command: /lib/systemd/systemd
 

-# Make sure the platforms listed below match up with
-# the `env.matrix` instances defined in `.travis.yml`
+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-2004-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-20.04


@@ -29,6 +41,9 @@ platforms:
       image: saltimages/salt-tiamat-py3:centos-7
 
   ## SALT `master`
       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


@@ -38,50 +53,57 @@ platforms:
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04

+  - name: centos-7-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-7

 
 

-  ## SALT `3001`
-  - name: debian-10-3001-py3
+  ## SALT `3004.1`
+  - name: debian-11-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3001-py3:debian-10
-  - name: debian-9-3001-py3
+      image: saltimages/salt-3004.1-py3:debian-11
+  - name: debian-10-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3001-py3:debian-9
-  - name: ubuntu-2004-3001-py3
+      image: saltimages/salt-3004.1-py3:debian-10
+  - name: ubuntu-2004-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3001-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
+  - name: ubuntu-1804-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3001-py3:ubuntu-18.04
-  - name: centos-7-3001-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
+  - name: centos-7-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3001-py3:centos-7
+      image: saltimages/salt-3004.1-py3:centos-7

 
 

-  ## SALT `3000.3`
-  - name: debian-10-3000-3-py3
+  ## SALT `3003.4`
+  - name: debian-11-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3000.3-py3:debian-10
-  - name: debian-9-3000-3-py3
+      image: saltimages/salt-3003.4-py3:debian-11
+  - name: debian-10-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3000.3-py3:debian-9
-  - name: ubuntu-1804-3000-3-py3
+      image: saltimages/salt-3003.4-py3:debian-10
+  - name: ubuntu-2004-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: centos-7-3000-3-py3
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3000.3-py3:centos-7
-  - name: ubuntu-1804-3000-3-py2
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
+  - name: centos-7-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
+      image: saltimages/salt-3003.4-py3:centos-7

 
 

-provisioner:
-  name: salt_solo
-  log_level: debug
-  salt_install: none
-  require_chef: false
-  formula: arvados
-  salt_copy_filter:
-    - .kitchen
-    - .git
+  ## SALT `3002.8`
+  - name: debian-10-3002.8-py3
+    driver:
+      image: saltimages/salt-3002.8-py3:debian-10
+  - name: ubuntu-2004-3002.8-py3
+    driver:
+      image: saltimages/salt-3002.8-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002.8-py3
+    driver:
+      image: saltimages/salt-3002.8-py3:ubuntu-18.04
+  - name: centos-7-3002.8-py3
+    driver:
+      image: saltimages/salt-3002.8-py3:centos-7

 
 verifier:
   # https://www.inspec.io/
 
 verifier:
   # https://www.inspec.io/


@@ -97,24 +119,36 @@ suites:
     driver:
       hostname: fixme.example.net
     provisioner:
     driver:
       hostname: fixme.example.net
     provisioner:

+      dependencies:
+        - name: single_host
+          path: test/salt/states/examples
+        - name: locale
+          repo: git
+          source: https://github.com/saltstack-formulas/locale-formula.git
+        - name: postgres
+          repo: git
+          source: https://github.com/saltstack-formulas/postgres-formula.git
+        - name: nginx
+          repo: git
+          source: https://github.com/saltstack-formulas/nginx-formula.git

       state_top:
         base:
           '*':
       state_top:
         base:
           '*':

-            - example_add_snakeoil_certs
+            - arvados._mapdata
+            - single_host.host_entries
+            - single_host.snakeoil_certs

             - locale
             - nginx.passenger
             - postgres
             - arvados.repo
             - locale
             - nginx.passenger
             - postgres
             - arvados.repo

-            # - arvados.config
-            # - arvados.ruby

             - arvados.api
             - arvados.websocket
             - 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.keepproxy

             - 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:


@@ -129,7 +163,7 @@ suites:
               - example_nginx_controller
               # keepproxy expects to retrieve a list of services from API, so
               # installing/testing it without an api server running will fail
               - example_nginx_controller
               # keepproxy expects to retrieve a list of services from API, so
               # installing/testing it without an api server running will fail

-              # - example_nginx_keepproxy
+              - example_nginx_keepproxy

       pillars_from_files:
         # yamllint disable rule:line-length
         arvados.sls: test/salt/pillar/arvados.sls
       pillars_from_files:
         # yamllint disable rule:line-length
         arvados.sls: test/salt/pillar/arvados.sls


@@ -139,38 +173,34 @@ suites:
         example_nginx_api.sls: test/salt/pillar/examples/nginx_api_configuration.sls
         example_nginx_websocket.sls: test/salt/pillar/examples/nginx_websocket_configuration.sls
         example_nginx_keepweb.sls: test/salt/pillar/examples/nginx_keepweb_configuration.sls
         example_nginx_api.sls: test/salt/pillar/examples/nginx_api_configuration.sls
         example_nginx_websocket.sls: test/salt/pillar/examples/nginx_websocket_configuration.sls
         example_nginx_keepweb.sls: test/salt/pillar/examples/nginx_keepweb_configuration.sls

-        # example_nginx_keepproxy.sls: test/salt/pillar/examples/nginx_keepproxy_configuration.sls
+        example_nginx_keepproxy.sls: test/salt/pillar/examples/nginx_keepproxy_configuration.sls

         example_nginx_controller.sls: test/salt/pillar/examples/nginx_controller_configuration.sls
         # yamllint enable rule:line-length
         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: locale
-          repo: git
-          source: https://github.com/saltstack-formulas/locale-formula.git
-        - name: postgres
-          repo: git
-          source: https://github.com/saltstack-formulas/postgres-formula.git
-        - name: nginx
-          repo: git
-          source: https://github.com/netmanagers/nginx-formula.git

     verifier:
       inspec_tests:
         - path: test/integration/api
         - path: test/integration/websocket
     verifier:
       inspec_tests:
         - path: test/integration/api
         - path: test/integration/websocket

-        # - path: test/integration/keepproxy
+        - path: test/integration/keepproxy

         - path: test/integration/keepweb
         - path: test/integration/controller
         - path: test/integration/keepweb
         - path: test/integration/controller

-
-  #### workbench,workbench2
+        - path: test/integration/keepbalance
+  #### workbench,workbench2,webshell

   - name: workbench
     driver:
       hostname: workbench.fixme.example.net
     provisioner:
   - name: workbench
     driver:
       hostname: workbench.fixme.example.net
     provisioner:

+      dependencies:
+        - name: single_host
+          path: test/salt/states/examples
+        - name: nginx
+          repo: git
+          source: https://github.com/saltstack-formulas/nginx-formula.git

       state_top:
         base:
           '*':
       state_top:
         base:
           '*':

-            - example_add_snakeoil_certs
+            - arvados._mapdata
+            - single_host.host_entries
+            - single_host.snakeoil_certs

             - nginx.passenger
             - arvados.repo
             - arvados.workbench
             - nginx.passenger
             - arvados.repo
             - arvados.workbench


@@ -183,24 +213,20 @@ suites:
               - example_nginx
               - example_nginx_workbench
               - example_nginx_workbench2
               - example_nginx
               - example_nginx_workbench
               - example_nginx_workbench2

+              - example_nginx_webshell

       pillars_from_files:
         # yamllint disable rule:line-length
         arvados.sls: test/salt/pillar/arvados.sls
         example_nginx.sls: test/salt/pillar/examples/nginx_passenger.sls
         example_nginx_workbench.sls: test/salt/pillar/examples/nginx_workbench_configuration.sls
         example_nginx_workbench2.sls: test/salt/pillar/examples/nginx_workbench2_configuration.sls
       pillars_from_files:
         # yamllint disable rule:line-length
         arvados.sls: test/salt/pillar/arvados.sls
         example_nginx.sls: test/salt/pillar/examples/nginx_passenger.sls
         example_nginx_workbench.sls: test/salt/pillar/examples/nginx_workbench_configuration.sls
         example_nginx_workbench2.sls: test/salt/pillar/examples/nginx_workbench2_configuration.sls

+        example_nginx_webshell.sls: test/salt/pillar/examples/nginx_webshell_configuration.sls

         # yamllint enable rule:line-length
         # yamllint enable rule:line-length

-      dependencies:
-        - name: example_add_snakeoil_certs
-          path: test/salt/states
-        - name: nginx
-          repo: git
-          source: https://github.com/saltstack-formulas/nginx-formula.git

     verifier:
       inspec_tests:
     verifier:
       inspec_tests:

+        - path: test/integration/repo

         - path: test/integration/workbench
         - path: test/integration/workbench2
         - path: test/integration/workbench
         - path: test/integration/workbench2

-

   #### shell
   - name: shell
     driver:
   #### shell
   - name: shell
     driver:


@@ -209,6 +235,7 @@ suites:
       state_top:
         base:
           '*':
       state_top:
         base:
           '*':

+            - arvados._mapdata

             # We also test repo here. No sense for a whole separate suite
             - arvados.repo
             - arvados.shell
             # We also test repo here. No sense for a whole separate suite
             - arvados.repo
             - arvados.shell


@@ -222,7 +249,6 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/shell
     verifier:
       inspec_tests:
         - path: test/integration/shell

-

   #### keepstore
   - name: keepstore
     driver:
   #### keepstore
   - name: keepstore
     driver:


@@ -231,17 +257,16 @@ suites:
       state_top:
         base:
           '*':
       state_top:
         base:
           '*':

+            - arvados._mapdata

             - arvados.repo
             - arvados.keepstore
             - arvados.repo
             - arvados.keepstore

-            # - arvados.clean

       pillars:
         top.sls:
           base:
             '*':
               - arvados
       pillars_from_files:
       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:
     verifier:
       inspec_tests:

-        - path: test/integration/repo

         - path: test/integration/keepstore
         - path: test/integration/keepstore