Skip to content

Commit 69812c1

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

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

Diff for: .github/workflows/kitchen.vagrant.yml

+4-2
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
steps:
2022
- name: 'Check out code'
2123
uses: 'actions/checkout@v2'

Diff for: kitchen.vagrant.yml

+17-8
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,26 @@ 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
1622
driver:
17-
box: bento/freebsd-12.2
18-
- name: freebsd-114-latest-py3
23+
box: myii/freebsd-12.2-master-py3
24+
- name: freebsd-114-master-py3
1925
driver:
20-
box: bento/freebsd-11.4
21-
22-
provisioner:
23-
salt_install: bootstrap
26+
box: myii/freebsd-11.4-master-py3
27+
- name: freebsd-122-3002-6-py3
28+
driver:
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

0 commit comments

Comments
 (0)