From 69812c1f62b90ba9094c873930ac334edac9a0aa Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Apr 2021 18:54:52 +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 | 25 +++++++++++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 08cf2cd..c89937b 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -14,8 +14,10 @@ jobs: fail-fast: false matrix: instance: - - default-freebsd-122-latest-py3 - - default-freebsd-114-latest-py3 + - default-freebsd-122-master-py3 + - default-freebsd-114-master-py3 + # - default-freebsd-122-3002-6-py3 + # - default-freebsd-114-3002-6-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index cb9c6d9..6ca8287 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -7,17 +7,26 @@ 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 - -provisioner: - salt_install: bootstrap + box: myii/freebsd-11.4-master-py3 + - name: freebsd-122-3002-6-py3 + driver: + box: myii/freebsd-12.2-3002.6-py3 + - name: freebsd-114-3002-6-py3 + driver: + box: myii/freebsd-11.4-3002.6-py3