projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18631-shell-login-sync'
[arvados-formula.git]
/
kitchen.yml
diff --git
a/kitchen.yml
b/kitchen.yml
index 8c1086d5a5c78fff2edcae1bb7a820bb2fbd6d6f..0b3dcd6285915d214fbb9f9efcf73a22a4d42e1f 100644
(file)
--- a/
kitchen.yml
+++ b/
kitchen.yml
@@
-24,6
+24,9
@@
provisioner:
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
@@
-38,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
@@
-51,61
+57,53
@@
platforms:
driver:
image: saltimages/salt-master-py3:centos-7
driver:
image: saltimages/salt-master-py3:centos-7
- ## SALT `300
3
.1`
- - name: debian-1
0-3003-
1-py3
+ ## SALT `300
4
.1`
+ - name: debian-1
1-3004.
1-py3
driver:
driver:
- image: saltimages/salt-300
3.1-py3:debian-10
- - name:
ubuntu-2004-3003-
1-py3
+ image: saltimages/salt-300
4.1-py3:debian-11
+ - name:
debian-10-3004.
1-py3
driver:
driver:
- image: saltimages/salt-300
3.1-py3:ubuntu-20.04
- - name: ubuntu-
1804-3003-
1-py3
+ image: saltimages/salt-300
4.1-py3:debian-10
+ - name: ubuntu-
2004-3004.
1-py3
driver:
driver:
- image: saltimages/salt-3003.1-py3:ubuntu-18.04
- - name: centos-7-3003-1-py3
- driver:
- image: saltimages/salt-3003.1-py3:centos-7
-
- ## SALT `3002.6`
- - name: debian-10-3002-6-py3
+ image: saltimages/salt-3004.1-py3:ubuntu-20.04
+ - name: ubuntu-1804-3004.1-py3
driver:
driver:
- image: saltimages/salt-300
2.6-py3:debian-10
- - name:
ubuntu-2004-3002-6
-py3
+ image: saltimages/salt-300
4.1-py3:ubuntu-18.04
+ - name:
centos-7-3004.1
-py3
driver:
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: centos-7-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:centos-7
+ image: saltimages/salt-3004.1-py3:centos-7
- ## SALT `3001.7`
- - name: debian-10-3001-7-py3
+ ## SALT `3003.4`
+ - name: debian-11-3003.4-py3
+ driver:
+ image: saltimages/salt-3003.4-py3:debian-11
+ - name: debian-10-3003.4-py3
driver:
driver:
- image: saltimages/salt-300
1.7
-py3:debian-10
- - name: ubuntu-2004-300
1-7
-py3
+ image: saltimages/salt-300
3.4
-py3:debian-10
+ - name: ubuntu-2004-300
3.4
-py3
driver:
driver:
- image: saltimages/salt-300
1.7
-py3:ubuntu-20.04
- - name: ubuntu-1804-300
1-7
-py3
+ image: saltimages/salt-300
3.4
-py3:ubuntu-20.04
+ - name: ubuntu-1804-300
3.4
-py3
driver:
driver:
- image: saltimages/salt-300
1.7
-py3:ubuntu-18.04
- - name: centos-7-300
1-7
-py3
+ image: saltimages/salt-300
3.4
-py3:ubuntu-18.04
+ - name: centos-7-300
3.4
-py3
driver:
driver:
- image: saltimages/salt-300
1.7
-py3:centos-7
+ image: saltimages/salt-300
3.4
-py3:centos-7
- ## SALT `300
0.9
`
- - name: debian-10-300
0-9
-py3
+ ## SALT `300
2.8
`
+ - name: debian-10-300
2.8
-py3
driver:
driver:
- image: saltimages/salt-300
0.9
-py3:debian-10
- - name: ubuntu-
1804-3000-9
-py3
+ image: saltimages/salt-300
2.8
-py3:debian-10
+ - name: ubuntu-
2004-3002.8
-py3
driver:
driver:
- image: saltimages/salt-300
0.9-py3:ubuntu-18
.04
- - name:
centos-7-3000-9
-py3
+ image: saltimages/salt-300
2.8-py3:ubuntu-20
.04
+ - name:
ubuntu-1804-3002.8
-py3
driver:
driver:
- image: saltimages/salt-300
0.9-py3:centos-7
- - name:
ubuntu-1804-3000-9-py2
+ image: saltimages/salt-300
2.8-py3:ubuntu-18.04
+ - name:
centos-7-3002.8-py3
driver:
driver:
- image: saltimages/salt-300
0.9-py2:ubuntu-18.04
+ image: saltimages/salt-300
2.8-py3:centos-7
verifier:
# https://www.inspec.io/
verifier:
# https://www.inspec.io/
@@
-149,6
+147,8
@@
suites:
- 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:
@@
-183,6
+183,7
@@
suites:
- path: test/integration/keepproxy
- path: test/integration/keepweb
- path: test/integration/controller
- path: test/integration/keepproxy
- path: test/integration/keepweb
- path: test/integration/controller
+ - path: test/integration/keepbalance
#### workbench,workbench2,webshell
- name: workbench
driver:
#### workbench,workbench2,webshell
- name: workbench
driver: