ci(vagrant): use pre-salted boxes & conditional local settings [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/311
This commit is contained in:
Imran Iqbal 2021-04-05 18:54:47 +01:00
parent b25f0a223f
commit 3173cc0851
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
3 changed files with 25 additions and 12 deletions

View File

@ -14,8 +14,10 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
instance: instance:
- freebsd-freebsd-122-latest-py3 - freebsd-freebsd-122-master-py3
- freebsd-freebsd-114-latest-py3 - freebsd-freebsd-114-master-py3
# - freebsd-freebsd-122-3002-6-py3
# - freebsd-freebsd-114-3002-6-py3
steps: steps:
- name: 'Check out code' - name: 'Check out code'
uses: 'actions/checkout@v2' uses: 'actions/checkout@v2'

View File

@ -7,17 +7,26 @@ driver:
customize: customize:
usbxhci: 'off' usbxhci: 'off'
gui: false gui: false
linked_clone: true
ssh: ssh:
shell: /bin/sh shell: /bin/sh
<% unless ENV['CI'] %>
linked_clone: true
synced_folders:
- - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
- '/vagrant'
- 'create: true, disabled: false'
<% end %>
platforms: platforms:
- name: freebsd-122-latest-py3 - name: freebsd-122-master-py3
driver: driver:
box: bento/freebsd-12.2 box: myii/freebsd-12.2-master-py3
- name: freebsd-114-latest-py3 - name: freebsd-114-master-py3
driver: driver:
box: bento/freebsd-11.4 box: myii/freebsd-11.4-master-py3
- name: freebsd-122-3002-6-py3
provisioner: driver:
salt_install: bootstrap box: myii/freebsd-12.2-3002.6-py3
- name: freebsd-114-3002-6-py3
driver:
box: myii/freebsd-11.4-3002.6-py3

View File

@ -457,8 +457,10 @@ suites:
- path: test/integration/default - path: test/integration/default
- name: freebsd - name: freebsd
includes: includes:
- freebsd-122-latest-py3 - freebsd-122-master-py3
- freebsd-114-latest-py3 - freebsd-114-master-py3
- freebsd-122-3002-6-py3
- freebsd-114-3002-6-py3
provisioner: provisioner:
state_top: state_top:
base: base: