From 5941618c6e322961009ce2e0aa6412337a71e79d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 5 Apr 2021 18:54:57 +0100
Subject: [PATCH] ci(vagrant): use pre-salted boxes & conditional local
 settings [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/311
---
 .github/workflows/kitchen.vagrant.yml |  6 +++---
 kitchen.vagrant.yml                   | 31 +++++++++++++++++----------
 kitchen.yml                           |  6 +++---
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 1ea1c46..c09c089 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - v3002-py3-freebsd-122-latest-py3
-          - v3002-py3-freebsd-114-latest-py3
-          - v3001-py3-openbsd-68-latest-py3
+          - v3002-py3-freebsd-122-3002-6-py3
+          - v3002-py3-freebsd-114-3002-6-py3
+          - v3001-py3-openbsd-68-3001-1-py3
           - v3002-py3-windows-81-latest-py3
     steps:
       - name: 'Check out code'
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 8248638..c1dd986 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -7,22 +7,35 @@ driver:
   customize:
     usbxhci: 'off'
   gui: false
-  linked_clone: true
   ssh:
     shell: /bin/sh
+  <% unless ENV['CI'] %>
+  linked_clone: true
+  synced_folders:
+    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
+      - '/vagrant'
+      - 'create: true, disabled: false'
+  <% end %>
 
 platforms:
-  - name: freebsd-122-latest-py3
+  - name: freebsd-122-master-py3
     driver:
-      box: bento/freebsd-12.2
-  - name: freebsd-114-latest-py3
+      box: myii/freebsd-12.2-master-py3
+  - name: freebsd-114-master-py3
     driver:
-      box: bento/freebsd-11.4
-  - name: openbsd-68-latest-py3
+      box: myii/freebsd-11.4-master-py3
+  - name: freebsd-122-3002-6-py3
     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:
         shell: /bin/ksh
+      synced_folders: []
   - name: windows-81-latest-py3
     driver:
       box: techneg/win81x64-pro-salt
@@ -30,7 +43,6 @@ platforms:
       customize: {}
       ssh: {}
     provisioner:
-      salt_install: none
       # yamllint disable rule:line-length
       init_environment: |
         # Workaround to allow `kitchen converge` to be used multiple times
@@ -45,6 +57,3 @@ platforms:
           skip_verify=True makedirs=True
         exit 0
       # yamllint enable rule:line-length
-
-provisioner:
-  salt_install: bootstrap
diff --git a/kitchen.yml b/kitchen.yml
index e4e4c76..08402a8 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -324,8 +324,8 @@ suites:
       - arch-base-latest-3002-5-py3
       - gentoo-stage3-latest-3002-5-py3
       - gentoo-stage3-systemd-3002-5-py3
-      - freebsd-122-latest-py3
-      - freebsd-114-latest-py3
+      - freebsd-122-3002-6-py3
+      - freebsd-114-3002-6-py3
       - windows-81-latest-py3
       - windows-2019-latest-py3
       - windows-2016-latest-py3
@@ -368,7 +368,7 @@ suites:
       - arch-base-latest-3001-6-py3
       - gentoo-stage3-latest-3001-6-py3
       - gentoo-stage3-systemd-3001-6-py3
-      - openbsd-68-latest-py3
+      - openbsd-68-3001-1-py3
     provisioner:
       state_top:
         base: