From 531de164b66ef66b66fadd2369ad302916131e39 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 5 Apr 2021 18:54:31 +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 | 8 ++++---
kitchen.vagrant.yml | 30 ++++++++++++++++++---------
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index f773d39..3cbacca 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -14,9 +14,11 @@ jobs:
fail-fast: false
matrix:
instance:
- - default-freebsd-122-latest-py3
- - default-freebsd-114-latest-py3
- - default-openbsd-68-latest-py3
+ - default-freebsd-122-master-py3
+ - default-freebsd-114-master-py3
+ # - default-freebsd-122-3002-6-py3
+ # - default-freebsd-114-3002-6-py3
+ - default-openbsd-68-3001-1-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 7d26508..c602f8e 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -7,22 +7,32 @@ 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: myii/freebsd-12.2-master-py3
+ - name: freebsd-114-master-py3
driver:
- box: bento/freebsd-12.2
- - name: freebsd-114-latest-py3
+ box: myii/freebsd-11.4-master-py3
+ - name: freebsd-122-3002-6-py3
driver:
- box: bento/freebsd-11.4
- - name: openbsd-68-latest-py3
+ box: myii/freebsd-12.2-3002.6-py3
+ - name: freebsd-114-3002-6-py3
driver:
- box: generic/openbsd6
+ 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
-
-provisioner:
- salt_install: bootstrap
+ synced_folders: []
--
GitLab