# -*- 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:
- 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
- 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
+ ## SALT `3003.1`
+ - name: debian-10-3003-1-py3
driver:
- image: saltimages/salt-3003.0-py3:ubuntu-18.04
- - name: centos-8-3003-0-py3
+ image: saltimages/salt-3003.1-py3:debian-10
+ - name: debian-9-3003-1-py3
driver:
- image: saltimages/salt-3003.0-py3:centos-8
- - name: centos-7-3003-0-py3
+ image: saltimages/salt-3003.1-py3:debian-9
+ - name: ubuntu-2004-3003-1-py3
driver:
- image: saltimages/salt-3003.0-py3:centos-7
- - name: amazonlinux-2-3003-0-py3
+ image: saltimages/salt-3003.1-py3:ubuntu-20.04
+ - name: ubuntu-1804-3003-1-py3
driver:
- image: saltimages/salt-3003.0-py3:amazonlinux-2
- - name: oraclelinux-8-3003-0-py3
+ image: saltimages/salt-3003.1-py3:ubuntu-18.04
+ - name: centos-7-3003-1-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
+ image: saltimages/salt-3003.1-py3:centos-7
## SALT `3002.6`
- name: debian-10-3002-6-py3
- name: ubuntu-1604-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:ubuntu-16.04
- - name: centos-8-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:centos-8
- name: centos-7-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:centos-7
- - name: amazonlinux-2-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:amazonlinux-2
- - name: oraclelinux-8-3002-6-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
## SALT `3001.7`
- name: debian-10-3001-7-py3
- name: ubuntu-1604-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:ubuntu-16.04
- - name: centos-8-3001-7-py3
- driver:
- image: saltimages/salt-3001.7-py3:centos-8
- name: centos-7-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:centos-7
- - name: amazonlinux-2-3001-7-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
## SALT `3000.9`
- name: debian-10-3000-9-py3
- 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
base:
'*':
- arvados._mapdata
+ - postgres
- single_host.host_entries
- single_host.snakeoil_certs
- locale
- nginx.passenger
- - postgres
- arvados.repo
- arvados.api
- arvados.websocket
- 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
- 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:
+ - path: test/integration/repo
- path: test/integration/workbench
- path: test/integration/workbench2
#### shell
- 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