projects / arvados-formula.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'fix-rvm-deps-in-centos'
[arvados-formula.git] / kitchen.yml
diff --git a/kitchen.yml b/kitchen.yml
index 53f989b309f1bcd34ab55fdb570485f151237397..8c1086d5a5c78fff2edcae1bb7a820bb2fbd6d6f 100644 (file)
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -1,5 +1,9 @@
 # -*- 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:
@@ -8,16 +12,21 @@ driver:
   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`
   - 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
@@ -38,53 +47,65 @@ platforms:
   - 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 `3003.1`
+  - name: debian-10-3003-1-py3
     driver:
-      image: saltimages/salt-3001-py3:debian-10
-  - name: debian-9-3001-py3
+      image: saltimages/salt-3003.1-py3:debian-10
+  - name: ubuntu-2004-3003-1-py3
     driver:
-      image: saltimages/salt-3001-py3:debian-9
-  - name: ubuntu-2004-3001-py3
+      image: saltimages/salt-3003.1-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003-1-py3
     driver:
-      image: saltimages/salt-3001-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-py3
+      image: saltimages/salt-3003.1-py3:ubuntu-18.04
+  - name: centos-7-3003-1-py3
     driver:
-      image: saltimages/salt-3001-py3:ubuntu-18.04
-  - name: centos-7-3001-py3
+      image: saltimages/salt-3003.1-py3:centos-7
+
+  ## SALT `3002.6`
+  - name: debian-10-3002-6-py3
     driver:
-      image: saltimages/salt-3001-py3:centos-7
-  - name: amazonlinux-2-3001-py3
+      image: saltimages/salt-3002.6-py3:debian-10
+  - name: ubuntu-2004-3002-6-py3
     driver:
-      image: saltimages/salt-3001-py3:amazonlinux-2
-
-  ## SALT `3000.3`
-  - name: debian-10-3000-3-py3
+      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: centos-7-3002-6-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-10
-  - name: debian-9-3000-3-py3
+      image: saltimages/salt-3002.6-py3:centos-7
+
+  ## SALT `3001.7`
+  - name: debian-10-3001-7-py3
     driver:
-      image: saltimages/salt-3000.3-py3:debian-9
-  - name: ubuntu-1804-3000-3-py3
+      image: saltimages/salt-3001.7-py3:debian-10
+  - name: ubuntu-2004-3001-7-py3
     driver:
-      image: saltimages/salt-3000.3-py3:ubuntu-18.04
-  - name: centos-7-3000-3-py3
+      image: saltimages/salt-3001.7-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-7-py3
     driver:
-      image: saltimages/salt-3000.3-py3:centos-7
-  - name: ubuntu-1804-3000-3-py2
+      image: saltimages/salt-3001.7-py3:ubuntu-18.04
+  - name: centos-7-3001-7-py3
     driver:
-      image: saltimages/salt-3000.3-py2:ubuntu-18.04
+      image: saltimages/salt-3001.7-py3:centos-7
 
-provisioner:
-  name: salt_solo
-  log_level: debug
-  salt_install: none
-  require_chef: false
-  formula: arvados
-  salt_copy_filter:
-    - .kitchen
-    - .git
+  ## SALT `3000.9`
+  - name: debian-10-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:debian-10
+  - name: ubuntu-1804-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:ubuntu-18.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
 
 verifier:
   # https://www.inspec.io/
@@ -100,9 +121,22 @@ suites:
     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:
           '*':
+            - arvados._mapdata
             - single_host.host_entries
             - single_host.snakeoil_certs
             - locale
@@ -142,18 +176,6 @@ suites:
         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
-      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/netmanagers/nginx-formula.git
     verifier:
       inspec_tests:
         - path: test/integration/api
@@ -161,15 +183,21 @@ suites:
         - path: test/integration/keepproxy
         - path: test/integration/keepweb
         - path: test/integration/controller
-
-  #### workbench,workbench2
+  #### workbench,workbench2,webshell
   - 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:
           '*':
+            - arvados._mapdata
             - single_host.host_entries
             - single_host.snakeoil_certs
             - nginx.passenger
@@ -184,24 +212,20 @@ suites:
               - 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
+        example_nginx_webshell.sls: test/salt/pillar/examples/nginx_webshell_configuration.sls
         # yamllint enable rule:line-length
-      dependencies:
-        - name: single_host
-          path: test/salt/states/examples
-        - name: nginx
-          repo: git
-          source: https://github.com/netmanagers/nginx-formula.git
     verifier:
       inspec_tests:
+        - path: test/integration/repo
         - path: test/integration/workbench
         - path: test/integration/workbench2
-
   #### shell
   - name: shell
     driver:
@@ -210,6 +234,7 @@ suites:
       state_top:
         base:
           '*':
+            - arvados._mapdata
             # We also test repo here. No sense for a whole separate suite
             - arvados.repo
             - arvados.shell
@@ -223,7 +248,6 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/shell
-
   #### keepstore
   - name: keepstore
     driver:
@@ -232,17 +256,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