Просмотр исходного кода

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

* Automated using https://github.com/myii/ssf-formula/pull/311
tags/v1.8.2
Imran Iqbal 3 лет назад
Родитель
Сommit
5941618c6e
Аккаунт пользователя с таким Email не найден
3 измененных файлов: 26 добавлений и 17 удалений
  1. +3
    -3
      .github/workflows/kitchen.vagrant.yml
  2. +20
    -11
      kitchen.vagrant.yml
  3. +3
    -3
      kitchen.yml

+ 3
- 3
.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'

+ 20
- 11
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: 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
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

+ 3
- 3
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:

Загрузка…
Отмена
Сохранить