X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/4871254408f8a9330de08fde2c21cb60ae1e5aa6..HEAD:/kitchen.yml diff --git a/kitchen.yml b/kitchen.yml index cb35319..0b3dcd6 100644 --- 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,208 +12,98 @@ driver: 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` + - 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-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-1604-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-16.04 - - name: centos-8-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:centos-8 - name: centos-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-7 - - name: amazonlinux-2-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:amazonlinux-2 - - name: oraclelinux-8-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:oraclelinux-8 - - name: oraclelinux-7-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:oraclelinux-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-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-1604-master-py3 - driver: - image: saltimages/salt-master-py3:ubuntu-16.04 - - name: centos-8-master-py3 - driver: - image: saltimages/salt-master-py3:centos-8 - name: centos-7-master-py3 driver: image: saltimages/salt-master-py3:centos-7 - - name: amazonlinux-2-master-py3 - driver: - image: saltimages/salt-master-py3:amazonlinux-2 - - name: oraclelinux-8-master-py3 - driver: - image: saltimages/salt-master-py3:oraclelinux-8 - - name: oraclelinux-7-master-py3 - driver: - image: saltimages/salt-master-py3:oraclelinux-7 - - ## SALT `3003.0` - - name: debian-10-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:debian-10 - - name: debian-9-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:debian-9 - - name: ubuntu-2004-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:ubuntu-20.04 - - name: ubuntu-1804-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:ubuntu-18.04 - - name: centos-8-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:centos-8 - - name: centos-7-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:centos-7 - - name: amazonlinux-2-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:amazonlinux-2 - - name: oraclelinux-8-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:oraclelinux-8 - - name: oraclelinux-7-3003-0-py3 - driver: - 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 + ## SALT `3004.1` + - name: debian-11-3004.1-py3 driver: - image: saltimages/salt-3002.6-py3:ubuntu-16.04 - - name: centos-8-3002-6-py3 + image: saltimages/salt-3004.1-py3:debian-11 + - name: debian-10-3004.1-py3 driver: - image: saltimages/salt-3002.6-py3:centos-8 - - name: centos-7-3002-6-py3 + image: saltimages/salt-3004.1-py3:debian-10 + - name: ubuntu-2004-3004.1-py3 driver: - image: saltimages/salt-3002.6-py3:centos-7 - - name: amazonlinux-2-3002-6-py3 + image: saltimages/salt-3004.1-py3:ubuntu-20.04 + - name: ubuntu-1804-3004.1-py3 driver: - image: saltimages/salt-3002.6-py3:amazonlinux-2 - - name: oraclelinux-8-3002-6-py3 + image: saltimages/salt-3004.1-py3:ubuntu-18.04 + - name: centos-7-3004.1-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 + image: saltimages/salt-3004.1-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 - driver: - image: saltimages/salt-3001.7-py3:debian-9 - - name: ubuntu-2004-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-7-py3 + ## SALT `3003.4` + - name: debian-11-3003.4-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-7-py3 + image: saltimages/salt-3003.4-py3:debian-11 + - name: debian-10-3003.4-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-16.04 - - name: centos-8-3001-7-py3 + image: saltimages/salt-3003.4-py3:debian-10 + - name: ubuntu-2004-3003.4-py3 driver: - image: saltimages/salt-3001.7-py3:centos-8 - - name: centos-7-3001-7-py3 + image: saltimages/salt-3003.4-py3:ubuntu-20.04 + - name: ubuntu-1804-3003.4-py3 driver: - image: saltimages/salt-3001.7-py3:centos-7 - - name: amazonlinux-2-3001-7-py3 + image: saltimages/salt-3003.4-py3:ubuntu-18.04 + - name: centos-7-3003.4-py3 driver: - image: saltimages/salt-3001.7-py3:amazonlinux-2 - - name: oraclelinux-8-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:oraclelinux-8 - - name: oraclelinux-7-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:oraclelinux-7 + image: saltimages/salt-3003.4-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 + ## SALT `3002.8` + - name: debian-10-3002.8-py3 driver: - image: saltimages/salt-3000.9-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-9-py3 + image: saltimages/salt-3002.8-py3:debian-10 + - name: ubuntu-2004-3002.8-py3 driver: - image: saltimages/salt-3000.9-py3:ubuntu-16.04 - - name: centos-8-3000-9-py3 + image: saltimages/salt-3002.8-py3:ubuntu-20.04 + - name: ubuntu-1804-3002.8-py3 driver: - image: saltimages/salt-3000.9-py3:centos-8 - - name: centos-7-3000-9-py3 + image: saltimages/salt-3002.8-py3:ubuntu-18.04 + - name: centos-7-3002.8-py3 driver: - image: saltimages/salt-3000.9-py3:centos-7 - - name: amazonlinux-2-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:amazonlinux-2 - - name: oraclelinux-8-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:oraclelinux-8 - - name: oraclelinux-7-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:oraclelinux-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/ @@ -253,6 +147,8 @@ suites: - arvados.keepweb - arvados.controller - arvados.dispatcher + - arvados.keepbalance + - arvados.shell.resources.virtual_machines pillars: top.sls: base: @@ -287,7 +183,8 @@ suites: - path: test/integration/keepproxy - 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 @@ -316,12 +213,14 @@ 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 verifier: inspec_tests: