Skip to content

Commit e110c28

Browse files
committed
ci(vagrant): use pre-salted boxes & conditional local settings [skip ci]
* Automated using myii/ssf-formula#311
1 parent 296922e commit e110c28

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

.github/workflows/kitchen.vagrant.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
instance:
17-
# - default-freebsd-122-latest-py3
18-
# - default-freebsd-114-latest-py3
17+
# - default-freebsd-122-master-py3
18+
# - default-freebsd-114-master-py3
19+
# - default-freebsd-122-3002-6-py3
20+
# - default-freebsd-114-3002-6-py3
1921
- default-windows-81-latest-py3
2022
steps:
2123
- name: 'Check out code'

kitchen.vagrant.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,36 @@ driver:
77
customize:
88
usbxhci: 'off'
99
gui: false
10-
linked_clone: true
1110
ssh:
1211
shell: /bin/sh
12+
<% unless ENV['CI'] %>
13+
linked_clone: true
14+
synced_folders:
15+
- - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
16+
- '/vagrant'
17+
- 'create: true, disabled: false'
18+
<% end %>
1319

1420
platforms:
15-
- name: freebsd-122-latest-py3
21+
- name: freebsd-122-master-py3
22+
driver:
23+
box: myii/freebsd-12.2-master-py3
24+
- name: freebsd-114-master-py3
1625
driver:
17-
box: bento/freebsd-12.2
18-
- name: freebsd-114-latest-py3
26+
box: myii/freebsd-11.4-master-py3
27+
- name: freebsd-122-3002-6-py3
1928
driver:
20-
box: bento/freebsd-11.4
29+
box: myii/freebsd-12.2-3002.6-py3
30+
- name: freebsd-114-3002-6-py3
31+
driver:
32+
box: myii/freebsd-11.4-3002.6-py3
2133
- name: windows-81-latest-py3
2234
driver:
2335
box: techneg/win81x64-pro-salt
2436
cache_directory: "/omnibus/cache"
2537
customize: {}
2638
ssh: {}
2739
provisioner:
28-
salt_install: none
2940
# yamllint disable rule:line-length
3041
init_environment: |
3142
# Workaround to allow `kitchen converge` to be used multiple times
@@ -40,6 +51,3 @@ platforms:
4051
skip_verify=True makedirs=True
4152
exit 0
4253
# yamllint enable rule:line-length
43-
44-
provisioner:
45-
salt_install: bootstrap

0 commit comments

Comments
 (0)