X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/6c52de7c70c90784df58e6dbc6c43a71b9cc7e7c..0bb9afbf9e3f8d0af0f883e7b5b28161c7391597:/kitchen.yml diff --git a/kitchen.yml b/kitchen.yml index 4067e1c..d0f50c5 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -8,8 +8,6 @@ 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` platforms: ## SALT `tiamat` - name: debian-10-tiamat-py3 @@ -24,58 +22,184 @@ platforms: - 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-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 - - name: amazonlinux-2-3001-py3 + ## 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-3001-py3:amazonlinux-2 + image: saltimages/salt-3003.0-py3:oraclelinux-8 + - name: oraclelinux-7-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:oraclelinux-7 - ## SALT `3001` - - name: debian-10-3001-py3 + ## 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-3001-py3:debian-10 - - name: debian-9-3001-py3 + image: saltimages/salt-3002.6-py3:ubuntu-16.04 + - name: centos-8-3002-6-py3 driver: - image: saltimages/salt-3001-py3:debian-9 - - name: ubuntu-2004-3001-py3 + image: saltimages/salt-3002.6-py3:centos-8 + - name: centos-7-3002-6-py3 driver: - image: saltimages/salt-3001-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-py3 + image: saltimages/salt-3002.6-py3:centos-7 + - name: amazonlinux-2-3002-6-py3 driver: - image: saltimages/salt-3001-py3:ubuntu-18.04 - - name: centos-7-3001-py3 + image: saltimages/salt-3002.6-py3:amazonlinux-2 + - name: oraclelinux-8-3002-6-py3 driver: - image: saltimages/salt-3001-py3:centos-7 + image: saltimages/salt-3002.6-py3:oraclelinux-8 + - name: oraclelinux-7-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:oraclelinux-7 - ## SALT `3000.3` - - name: debian-10-3000-3-py3 + ## 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 driver: - image: saltimages/salt-3000.3-py3:debian-10 - - name: debian-9-3000-3-py3 + image: saltimages/salt-3001.7-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-7-py3 driver: - image: saltimages/salt-3000.3-py3:debian-9 - - name: ubuntu-1804-3000-3-py3 + image: saltimages/salt-3001.7-py3:ubuntu-16.04 + - name: centos-8-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:centos-8 + - name: centos-7-3001-7-py3 driver: - image: saltimages/salt-3000.3-py3:centos-7 - - name: ubuntu-1804-3000-3-py2 + image: saltimages/salt-3001.7-py3:centos-7 + - name: amazonlinux-2-3001-7-py3 driver: - image: saltimages/salt-3000.3-py2:ubuntu-18.04 + 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 + + ## 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-8-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:centos-8 + - name: centos-7-3000-9-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 @@ -101,19 +225,30 @@ 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/netmanagers/nginx-formula.git state_top: base: '*': - - example_single_host_host_entries - - example_add_snakeoil_certs + - arvados._mapdata + - single_host.host_entries + - single_host.snakeoil_certs - locale - nginx.passenger - postgres - arvados.repo - 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.keepweb - arvados.controller @@ -145,20 +280,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: example_single_host_host_entries - path: test/salt/states - - 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 @@ -166,17 +287,23 @@ suites: - path: test/integration/keepproxy - path: test/integration/keepweb - path: test/integration/controller - #### workbench,workbench2 - 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/netmanagers/nginx-formula.git state_top: base: '*': - - example_single_host_host_entries - - example_add_snakeoil_certs + - arvados._mapdata + - single_host.host_entries + - single_host.snakeoil_certs - nginx.passenger - arvados.repo - arvados.workbench @@ -196,19 +323,10 @@ suites: example_nginx_workbench.sls: test/salt/pillar/examples/nginx_workbench_configuration.sls example_nginx_workbench2.sls: test/salt/pillar/examples/nginx_workbench2_configuration.sls # yamllint enable rule:line-length - dependencies: - - name: example_single_host_host_entries - path: test/salt/states - - name: example_add_snakeoil_certs - path: test/salt/states - - name: nginx - repo: git - source: https://github.com/netmanagers/nginx-formula.git verifier: inspec_tests: - path: test/integration/workbench - path: test/integration/workbench2 - #### shell - name: shell driver: @@ -217,6 +335,7 @@ suites: state_top: base: '*': + - arvados._mapdata # We also test repo here. No sense for a whole separate suite - arvados.repo - arvados.shell @@ -230,7 +349,6 @@ suites: verifier: inspec_tests: - path: test/integration/shell - #### keepstore - name: keepstore driver: @@ -239,6 +357,7 @@ suites: state_top: base: '*': + - arvados._mapdata - arvados.repo - arvados.keepstore # - arvados.clean