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:57 +01:00
parent 157e566008
commit 5941618c6e
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
3 changed files with 26 additions and 17 deletions

View File

@ -14,9 +14,9 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
instance: instance:
- v3002-py3-freebsd-122-latest-py3 - v3002-py3-freebsd-122-3002-6-py3
- v3002-py3-freebsd-114-latest-py3 - v3002-py3-freebsd-114-3002-6-py3
- v3001-py3-openbsd-68-latest-py3 - v3001-py3-openbsd-68-3001-1-py3
- v3002-py3-windows-81-latest-py3 - v3002-py3-windows-81-latest-py3
steps: steps:
- name: 'Check out code' - name: 'Check out code'

View File

@ -7,22 +7,35 @@ 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: openbsd-68-latest-py3 - name: freebsd-122-3002-6-py3
driver: driver:
box: generic/openbsd6 box: myii/freebsd-12.2-3002.6-py3
- name: freebsd-114-3002-6-py3
driver:
box: myii/freebsd-11.4-3002.6-py3
- name: openbsd-68-3001-1-py3
driver:
box: myii/openbsd-6.8-3001.1-py3
ssh: ssh:
shell: /bin/ksh shell: /bin/ksh
synced_folders: []
- name: windows-81-latest-py3 - name: windows-81-latest-py3
driver: driver:
box: techneg/win81x64-pro-salt box: techneg/win81x64-pro-salt
@ -30,7 +43,6 @@ platforms:
customize: {} customize: {}
ssh: {} ssh: {}
provisioner: provisioner:
salt_install: none
# yamllint disable rule:line-length # yamllint disable rule:line-length
init_environment: | init_environment: |
# Workaround to allow `kitchen converge` to be used multiple times # Workaround to allow `kitchen converge` to be used multiple times
@ -45,6 +57,3 @@ platforms:
skip_verify=True makedirs=True skip_verify=True makedirs=True
exit 0 exit 0
# yamllint enable rule:line-length # yamllint enable rule:line-length
provisioner:
salt_install: bootstrap

View File

@ -324,8 +324,8 @@ suites:
- arch-base-latest-3002-5-py3 - arch-base-latest-3002-5-py3
- gentoo-stage3-latest-3002-5-py3 - gentoo-stage3-latest-3002-5-py3
- gentoo-stage3-systemd-3002-5-py3 - gentoo-stage3-systemd-3002-5-py3
- freebsd-122-latest-py3 - freebsd-122-3002-6-py3
- freebsd-114-latest-py3 - freebsd-114-3002-6-py3
- windows-81-latest-py3 - windows-81-latest-py3
- windows-2019-latest-py3 - windows-2019-latest-py3
- windows-2016-latest-py3 - windows-2016-latest-py3
@ -368,7 +368,7 @@ suites:
- arch-base-latest-3001-6-py3 - arch-base-latest-3001-6-py3
- gentoo-stage3-latest-3001-6-py3 - gentoo-stage3-latest-3001-6-py3
- gentoo-stage3-systemd-3001-6-py3 - gentoo-stage3-systemd-3001-6-py3
- openbsd-68-latest-py3 - openbsd-68-3001-1-py3
provisioner: provisioner:
state_top: state_top:
base: base: