Skip to content

Commit 51cf404

Browse files
myiimyii
committed
feat(vagrant): use pre-salted boxes & conditional local settings
Pre-salted Vagrant boxes: * https://app.vagrantup.com/myii/boxes/freebsd-12.2-master-py3 * https://app.vagrantup.com/myii/boxes/freebsd-11.4-master-py3 * https://app.vagrantup.com/myii/boxes/freebsd-12.2-3002.6-py3 * https://app.vagrantup.com/myii/boxes/freebsd-11.4-3002.6-py3 * https://app.vagrantup.com/myii/boxes/openbsd-6.8-3001.1-py3
1 parent eddc13e commit 51cf404

File tree

4 files changed

+38
-30
lines changed

4 files changed

+38
-30
lines changed

‎ssf/defaults.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ ssf_node_anchors:
6464
# An alternative method could be to use:
6565
# `git describe --abbrev=0 --tags`
6666
# yamllint disable rule:line-length rule:quoted-strings
67-
title: "chore: update '`'CODEOWNERS'`' & '`'.yamllint'`' re: '`'kitchen-vagrant'`' [skip ci]"
68-
body: '* Automated using https://github.com/myii/ssf-formula/pull/310'
67+
title: "ci(vagrant): use pre-salted boxes & conditional local settings [skip ci]"
68+
body: '* Automated using https://github.com/myii/ssf-formula/pull/311'
6969
# yamllint enable rule:line-length rule:quoted-strings
7070
github:
7171
owner: 'saltstack-formulas'
@@ -314,10 +314,12 @@ ssf:
314314
- [windows , 2016 , latest, 3] # wind-2016-latest-py3
315315
vagrantboxes:
316316
### `freebsd`
317-
- [freebsd , 12.2 , latest, 3] # fbsd-12.2-latest-py3
318-
- [freebsd , 11.4 , latest, 3] # fbsd-11.4-latest-py3
317+
- [freebsd , 12.2 , master, 3] # fbsd-12.2-master-py3
318+
- [freebsd , 11.4 , master, 3] # fbsd-11.4-master-py3
319+
- [freebsd , 12.2 , 3002.6, 3] # fbsd-12.2-3002.6-py3
320+
- [freebsd , 11.4 , 3002.6, 3] # fbsd-11.4-3002.6-py3
319321
### `openbsd`
320-
- [openbsd , 6.8 , latest, 3] # obsd-06.8-latest-py3
322+
- [openbsd , 6.8 , 3001.1, 3] # obsd-06.8-master-py3
321323
### `windows`
322324
- [windows , 8.1 , latest, 3] # wind-08.1-latest-py3
323325
saltimages:

‎ssf/files/default/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ gem 'kitchen-salt', '>= 0.6.3'
2222
'php',
2323
'postgres',
2424
'salt',
25-
] %}
25+
] %}
2626
{%- if semrel_formula in ['openvpn'] %}
2727
gem 'rspec-retry'
2828
{%- endif %}

‎ssf/files/default/kitchen.vagrant.yml‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ driver:
77
customize:
88
usbxhci: 'off'
99
gui: false
10-
linked_clone: true
1110
ssh:
1211
shell: /bin/sh
12+
<% unless ENV['CI'] %>
13+
linked_clone: true
14+
synced_folders:
15+
- - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
16+
- '/vagrant'
17+
- 'create: true, disabled: false'
18+
<% end %>
1319

1420
platforms:
1521
{%- for platform in vagrantboxes %}
@@ -25,21 +31,24 @@ platforms:
2531
{%- endif %}
2632
- name: {{ os | replace('/', '-') }}-{{ os_ver | replace('.', '') }}-{{ salt_ver | replace('.', '-') }}-py{{ py_ver }}
2733
driver:
28-
{%- if os == 'freebsd' %}
29-
box: {{ 'bento/{}-{}'.format(os, os_ver) }}
30-
{%- elif os == 'openbsd' %}
31-
box: {{ 'generic/{}{}'.format(os, os_ver | int) }}
34+
{#- `box` first #}
35+
{%- if os == 'windows' %}
36+
box: {{ testing_windows.vagrant.platforms.driver.box }}
37+
{%- else %}
38+
box: {{ 'myii/{}-{}-{}-py{}'.format(os, os_ver, salt_ver, py_ver) }}
39+
{%- endif %}
40+
{#- Remaining settings #}
41+
{%- if os == 'openbsd' %}
3242
ssh:
3343
{{ testing_openbsd.vagrant.platforms.driver.ssh | yaml(False) | indent(8) }}
44+
synced_folders: []
3445
{%- elif os == 'windows' %}
35-
box: {{ testing_windows.vagrant.platforms.driver.box }}
3646
cache_directory: "/omnibus/cache"
3747
customize: {}
3848
ssh: {}
3949
{%- endif %}
4050
{%- if os == 'windows' %}
4151
provisioner:
42-
salt_install: none
4352
# yamllint disable rule:line-length
4453
init_environment: |
4554
# Workaround to allow `kitchen converge` to be used multiple times
@@ -58,6 +67,3 @@ platforms:
5867
# yamllint enable rule:line-length
5968
{%- endif %}
6069
{%- endfor %}
61-
62-
provisioner:
63-
salt_install: bootstrap

‎ssf/formulas.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ ssf:
424424
- [oraclelinux , 7 , master, 0, ''] # modules
425425
# # - [gentoo/stage3, 0 , master, 0, default]
426426
- [arch-base , 0 , 3002.5, 0, modules] # POSSIBLE
427-
- [freebsd , 0 , latest, 3, '']
427+
- [freebsd , 0 , master, 3, '']
428428
testing_freebsd:
429429
active: true
430430
use_tofs: true
@@ -1341,8 +1341,8 @@ ssf:
13411341
- [oraclelinux , 0 , master, 0, '']
13421342
# # - [gentoo/stage3, 0 , master, 0, '']
13431343
- [arch-base , 0 , 3002.5, 0, '']
1344-
- [freebsd , 0 , latest, 3, '']
1345-
- [openbsd , 0 , latest, 3, package]
1344+
- [freebsd , 0 , master, 3, '']
1345+
- [openbsd , 0 , 3001.1, 3, package]
13461346
- [windows , 0 , latest, 3, '']
13471347
testing_freebsd:
13481348
active: true
@@ -3021,7 +3021,7 @@ ssf:
30213021
- [oraclelinux , 7 , master, 0, default]
30223022
- [gentoo/stage3, systemd, master, 0, default]
30233023
- [arch-base , 0 , 3002.5, 0, default]
3024-
- [freebsd , 0 , latest, 3, default]
3024+
- [freebsd , 0 , master, 3, default]
30253025
testing_freebsd:
30263026
active: true
30273027
use_tofs: true
@@ -3318,8 +3318,8 @@ ssf:
33183318
- [oraclelinux , 0 , master, 0, default]
33193319
- [gentoo/stage3, 0 , master, 0, default]
33203320
- [arch-base , 0 , 3002.2, 0, default]
3321-
- [freebsd , 0 , latest, 3, default]
3322-
- [openbsd , 0 , latest, 3, default]
3321+
- [freebsd , 0 , master, 3, default]
3322+
- [openbsd , 0 , 3001.1, 3, default]
33233323
testing_freebsd:
33243324
active: true
33253325
testing_openbsd:
@@ -3372,7 +3372,7 @@ ssf:
33723372
# # - [gentoo/stage3, 0 , master, 0, default]
33733373
# # - [arch-base , 0 , 3002.5, 0, default]
33743374
# # TODO: Fix 2 failing states in order to enable this
3375-
# # - [freebsd , 0 , latest, 3, default]
3375+
# # - [freebsd , 0 , master, 3, default]
33763376
- [windows , 0 , latest, 3, default]
33773377
testing_freebsd:
33783378
active: true
@@ -3664,7 +3664,7 @@ ssf:
36643664
- [oraclelinux , 0 , master, 0, redhat]
36653665
# # - [gentoo/stage3, 0 , master, 0, gentoo]
36663666
# # - [arch-base , 0 , 3002.5, 0, arch]
3667-
- [freebsd , 0 , latest, 3, freebsd]
3667+
- [freebsd , 0 , master, 3, freebsd]
36683668
testing_freebsd:
36693669
active: true
36703670
use_tofs: true
@@ -3736,8 +3736,8 @@ ssf:
37363736
- [oraclelinux , 0 , master, 0, default]
37373737
# # - [gentoo/stage3, 0 , master, 0, default]
37383738
- [arch-base , 0 , 3002.5, 0, default]
3739-
- [freebsd , 0 , latest, 3, default]
3740-
# # - [openbsd , 0 , latest, 3, default]
3739+
- [freebsd , 0 , master, 3, default]
3740+
# # - [openbsd , 0 , 3001.1, 3, default]
37413741
# # - [windows , 0 , latest, 3, default]
37423742
testing_freebsd:
37433743
active: true
@@ -4185,7 +4185,7 @@ ssf:
41854185
includes:
41864186
# [os , os_ver, salt_ver, py_ver]
41874187
- [0 , 0 , 3002.5, 3]
4188-
- [freebsd , 0 , latest, 3]
4188+
- [freebsd , 0 , 3002.6, 3]
41894189
- [windows , 0 , latest, 3]
41904190
inspec_yml:
41914191
summary: >-
@@ -4203,7 +4203,7 @@ ssf:
42034203
includes:
42044204
# [os , os_ver, salt_ver, py_ver]
42054205
- [0 , 0 , 3001.6, 3]
4206-
- [openbsd , 0 , latest, 3]
4206+
- [openbsd , 0 , 3001.1, 3]
42074207
inspec_yml:
42084208
summary: >-
42094209
Verify that Salt `v3001-py3` is setup and configured
@@ -4279,7 +4279,7 @@ ssf:
42794279
- [arch-base , latest, 3002.5, 3, v3002-py3]
42804280
- [gentoo/stage3, latest, 3002.5, 3, v3002-py3]
42814281
- [gentoo/stage3, systemd, 3002.5, 3, v3002-py3]
4282-
- [freebsd , 0 , latest, 3, v3002-py3]
4282+
- [freebsd , 0 , 3002.6, 3, v3002-py3]
42834283
- [windows , 0 , latest, 3, v3002-py3]
42844284
- [debian , 10 , 3001.6, 3, v3001-py3]
42854285
# - [debian , 9 , 3001.6, 3, v3001-py3]
@@ -4300,7 +4300,7 @@ ssf:
43004300
# # - [arch-base , latest, 3001.6, 3, v3001-py3]
43014301
# - [gentoo/stage3, latest, 3001.6, 3, v3001-py3]
43024302
# - [gentoo/stage3, systemd, 3001.6, 3, v3001-py3]
4303-
- [openbsd , 0 , latest, 3, v3001-py3]
4303+
- [openbsd , 0 , 3001.1, 3, v3001-py3]
43044304
# - [debian , 10 , 3000.8, 3, v3000-py3]
43054305
- [debian , 9 , 3000.8, 3, v3000-py3]
43064306
- [ubuntu , 18.04, 3000.8, 3, v3000-py3]

0 commit comments

Comments
 (0)