Skip to content

Commit 62098b2

Browse files
myiimyii
authored
Merge pull request #280 from myii/feat/add-3002-to-salt-formula
feat(salt): adjust matrix to add Magnesium `3002`
2 parents de1e402 + 8ada127 commit 62098b2

File tree

2 files changed

+125
-102
lines changed

2 files changed

+125
-102
lines changed

‎ssf/defaults.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ ssf_node_anchors:
5959
# An alternative method could be to use:
6060
# `git describe --abbrev=0 --tags`
6161
# yamllint disable rule:line-length rule:quoted-strings
62-
title: "ci(kitchen+gitlab): update for new pre-salted images [skip ci]"
63-
body: '* Automated using https://github.com/myii/ssf-formula/pull/279'
62+
title: "ci(kitchen+gitlab): adjust matrix to add '`'3002'`'"
63+
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/280'
6464
# yamllint enable rule:line-length rule:quoted-strings
6565
github:
6666
owner: 'saltstack-formulas'
@@ -1073,11 +1073,14 @@ ssf:
10731073
<<: *isk_default
10741074
0:
10751075
<<: *isk_suite_default
1076-
name: 'v3001-py3'
1076+
name: 'v3002-py3'
10771077
1:
10781078
<<: *isk_suite_default
1079-
name: 'v3000-py3'
1079+
name: 'v3001-py3'
10801080
2:
1081+
<<: *isk_suite_default
1082+
name: 'v3000-py3'
1083+
3:
10811084
<<: *isk_suite_default
10821085
name: 'v3000-py2'
10831086
sqldeveloper: *formula_default

‎ssf/formulas.yaml‎

Lines changed: 118 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -4124,20 +4124,54 @@ ssf:
41244124
0:
41254125
includes:
41264126
# [os , os_ver, salt_ver, py_ver]
4127-
- [debian , 10 , 3001 , 3]
4128-
- [debian , 9 , 3001 , 3]
4129-
- [ubuntu , 20.04, 3001 , 3]
4130-
- [ubuntu , 18.04, 3001 , 3]
4131-
- [centos , 8 , 3001 , 3]
4132-
- [centos , 7 , 3001 , 3]
4133-
- [fedora , 32 , 3001 , 3]
4134-
- [fedora , 31 , 3001 , 3]
4135-
- [opensuse/leap, 15.2 , 3001 , 3]
4136-
- [amazonlinux , 2 , 3001 , 3]
4137-
- [oraclelinux , 8 , 3001 , 3]
4138-
- [oraclelinux , 7 , 3001 , 3]
4139-
- [gentoo/stage3, latest, 3001 , 3]
4140-
- [gentoo/stage3, systemd, 3001 , 3]
4127+
- [debian , 10 , 3002.2, 3]
4128+
- [debian , 9 , 3002.2, 3]
4129+
- [ubuntu , 20.04, 3002.2, 3]
4130+
- [ubuntu , 18.04, 3002.2, 3]
4131+
- [ubuntu , 16.04, 3002.2, 3]
4132+
- [centos , 8 , 3002.2, 3]
4133+
- [centos , 7 , 3002.2, 3]
4134+
- [fedora , 33 , 3002.2, 3]
4135+
- [fedora , 32 , 3002.2, 3]
4136+
- [opensuse/leap, 15.2 , 3002.2, 3]
4137+
- [amazonlinux , 2 , 3002.2, 3]
4138+
- [oraclelinux , 8 , 3002.2, 3]
4139+
- [oraclelinux , 7 , 3002.2, 3]
4140+
# # - [arch-base , latest, 3002.2, 3]
4141+
- [gentoo/stage3, latest, 3002.2, 3]
4142+
- [gentoo/stage3, systemd, 3002.2, 3]
4143+
inspec_yml:
4144+
summary: >-
4145+
Verify that Salt `v3002-py3` is setup and configured
4146+
supports: *supports_all_including_oracle_and_gentoo
4147+
provisioner:
4148+
pillars:
4149+
- '*':
4150+
- .
4151+
- v3002-py3
4152+
pillars_from_files:
4153+
- .sls: 'test/salt/pillar/salt.sls'
4154+
- v3002-py3.sls: 'test/salt/pillar/v3002-py3.sls'
4155+
state_top: *state_top_salt
4156+
1:
4157+
includes:
4158+
# [os , os_ver, salt_ver, py_ver]
4159+
- [debian , 10 , 3001.4, 3]
4160+
- [debian , 9 , 3001.4, 3]
4161+
- [ubuntu , 20.04, 3001.4, 3]
4162+
- [ubuntu , 18.04, 3001.4, 3]
4163+
- [ubuntu , 16.04, 3001.4, 3]
4164+
- [centos , 8 , 3001.4, 3]
4165+
- [centos , 7 , 3001.4, 3]
4166+
- [fedora , 33 , 3001.4, 3]
4167+
- [fedora , 32 , 3001.4, 3]
4168+
- [opensuse/leap, 15.2 , 3001.4, 3]
4169+
- [amazonlinux , 2 , 3001.4, 3]
4170+
- [oraclelinux , 8 , 3001.4, 3]
4171+
- [oraclelinux , 7 , 3001.4, 3]
4172+
# # - [arch-base , latest, 3001.4, 3]
4173+
- [gentoo/stage3, latest, 3001.4, 3]
4174+
- [gentoo/stage3, systemd, 3001.4, 3]
41414175
inspec_yml:
41424176
summary: >-
41434177
Verify that Salt `v3001-py3` is setup and configured
@@ -4151,21 +4185,21 @@ ssf:
41514185
- .sls: 'test/salt/pillar/salt.sls'
41524186
- v3001-py3.sls: 'test/salt/pillar/v3001-py3.sls'
41534187
state_top: *state_top_salt
4154-
1:
4188+
2:
41554189
includes:
41564190
# [os , os_ver, salt_ver, py_ver]
4157-
- [debian , 10 , 3000.3, 3]
4158-
- [debian , 9 , 3000.3, 3]
4159-
- [ubuntu , 18.04, 3000.3, 3]
4160-
- [centos , 8 , 3000.3, 3]
4161-
- [centos , 7 , 3000.3, 3]
4162-
# # - [fedora , 31 , 3000.3, 3]
4163-
- [opensuse/leap, 15.2 , 3000.3, 3]
4164-
- [amazonlinux , 2 , 3000.3, 3]
4165-
- [oraclelinux , 8 , 3000.3, 3]
4166-
- [oraclelinux , 7 , 3000.3, 3]
4167-
- [gentoo/stage3, latest, 3000.3, 3]
4168-
- [gentoo/stage3, systemd, 3000.3, 3]
4191+
- [debian , 10 , 3000.6, 3]
4192+
- [debian , 9 , 3000.6, 3]
4193+
- [ubuntu , 18.04, 3000.6, 3]
4194+
- [ubuntu , 16.04, 3000.6, 3]
4195+
- [centos , 8 , 3000.6, 3]
4196+
- [centos , 7 , 3000.6, 3]
4197+
- [opensuse/leap, 15.2 , 3000.6, 3]
4198+
- [amazonlinux , 2 , 3000.6, 3]
4199+
- [oraclelinux , 8 , 3000.6, 3]
4200+
- [oraclelinux , 7 , 3000.6, 3]
4201+
- [gentoo/stage3, latest, 3000.6, 3]
4202+
- [gentoo/stage3, systemd, 3000.6, 3]
41694203
inspec_yml:
41704204
summary: >-
41714205
Verify that Salt `v3000-py3` is setup and configured
@@ -4179,11 +4213,12 @@ ssf:
41794213
- .sls: 'test/salt/pillar/salt.sls'
41804214
- v3000-py3.sls: 'test/salt/pillar/v3000-py3.sls'
41814215
state_top: *state_top_salt
4182-
2:
4216+
3:
41834217
includes:
41844218
# [os , os_ver, salt_ver, py_ver]
4185-
- [ubuntu , 18.04, 3000.3, 2]
4186-
- [ubuntu , 16.04, 3000.3, 2]
4219+
- [ubuntu , 18.04, 3000.6, 2]
4220+
- [ubuntu , 16.04, 3000.6, 2]
4221+
# # - [arch-base , latest, 3000.6, 2]
41874222
inspec_yml:
41884223
summary: >-
41894224
Verify that Salt `v3000-py2` is setup and configured
@@ -4198,79 +4233,64 @@ ssf:
41984233
- v3000-py2.sls: 'test/salt/pillar/v3000-py2.sls'
41994234
state_top: *state_top_salt
42004235
inspec_suites_matrix:
4236+
- v3002-py3
42014237
- v3001-py3
42024238
- v3000-py3
42034239
- v3000-py2
4204-
platforms:
4205-
# [os , os_ver, salt_ver, py_ver]
4206-
- [debian , 10 , 3001 , 3]
4207-
- [debian , 9 , 3001 , 3]
4208-
- [ubuntu , 20.04, 3001 , 3]
4209-
- [ubuntu , 18.04, 3001 , 3]
4210-
- [centos , 8 , 3001 , 3]
4211-
- [centos , 7 , 3001 , 3]
4212-
- [fedora , 32 , 3001 , 3]
4213-
- [fedora , 31 , 3001 , 3]
4214-
- [opensuse/leap, 15.2 , 3001 , 3]
4215-
- [amazonlinux , 2 , 3001 , 3]
4216-
- [oraclelinux , 8 , 3001 , 3]
4217-
- [oraclelinux , 7 , 3001 , 3]
4218-
- [gentoo/stage3, latest, 3001 , 3]
4219-
- [gentoo/stage3, systemd, 3001 , 3]
4220-
- [debian , 10 , 3000.3, 3]
4221-
- [debian , 9 , 3000.3, 3]
4222-
- [ubuntu , 18.04, 3000.3, 3]
4223-
- [centos , 8 , 3000.3, 3]
4224-
- [centos , 7 , 3000.3, 3]
4225-
# # - [fedora , 31 , 3000.3, 3]
4226-
- [opensuse/leap, 15.2 , 3000.3, 3]
4227-
- [amazonlinux , 2 , 3000.3, 3]
4228-
- [oraclelinux , 8 , 3000.3, 3]
4229-
- [oraclelinux , 7 , 3000.3, 3]
4230-
- [ubuntu , 18.04, 3000.3, 2]
4231-
- [ubuntu , 16.04, 3000.3, 2]
4232-
- [gentoo/stage3, latest, 3000.3, 3]
4233-
- [gentoo/stage3, systemd, 3000.3, 3]
4234-
- [debian , 10 , 2019.2, 3]
4235-
- [debian , 9 , 2019.2, 3]
4236-
- [ubuntu , 18.04, 2019.2, 3]
4237-
- [ubuntu , 16.04, 2019.2, 3]
4238-
- [centos , 8 , 2019.2, 3]
4239-
- [centos , 7 , 2019.2, 3]
4240-
- [fedora , 31 , 2019.2, 3]
4241-
- [opensuse/leap, 15.2 , 2019.2, 3]
4242-
- [amazonlinux , 2 , 2019.2, 3]
4243-
- [centos , 6 , 2019.2, 2]
4244-
- [amazonlinux , 1 , 2019.2, 2]
4240+
platforms: *platforms_new_saltimages
42454241
platforms_matrix:
42464242
# [os , os_ver, salt_ver, py_ver, inspec_suite]
4247-
- [debian , 10 , 3001 , 3, v3001-py3]
4248-
# - [debian , 9 , 3001 , 3, v3001-py3]
4249-
- [ubuntu , 20.04, 3001 , 3, v3001-py3]
4250-
# - [ubuntu , 18.04, 3001 , 3, v3001-py3]
4251-
- [centos , 8 , 3001 , 3, v3001-py3]
4252-
# - [centos , 7 , 3001 , 3, v3001-py3]
4253-
- [fedora , 32 , 3001 , 3, v3001-py3]
4254-
# # Installs `3000.3`
4255-
# # - [fedora , 31 , 3001 , 3, v3001-py3]
4256-
# # - [opensuse/leap, 15.2 , 3001 , 3, v3001-py3]
4257-
# - [amazonlinux , 2 , 3001 , 3, v3001-py3]
4258-
- [oraclelinux , 8 , 3001 , 3, v3001-py3]
4259-
# - [oraclelinux , 7 , 3001 , 3, v3001-py3]
4260-
- [gentoo/stage3, latest, 3001 , 3, v3001-py3]
4261-
- [gentoo/stage3, systemd, 3001 , 3, v3001-py3]
4262-
# - [debian , 10 , 3000.3, 3, v3000-py3]
4263-
# - [debian , 9 , 3000.3, 3, v3000-py3]
4264-
# - [ubuntu , 18.04, 3000.3, 3, v3000-py3]
4265-
# - [centos , 8 , 3000.3, 3, v3000-py3]
4266-
# - [centos , 7 , 3000.3, 3, v3000-py3]
4267-
# # - [fedora , 31 , 3000.3, 3, v3000-py3]
4268-
- [opensuse/leap, 15.2 , 3000.3, 3, v3000-py3]
4269-
- [amazonlinux , 2 , 3000.3, 3, v3000-py3]
4270-
# - [oraclelinux , 8 , 3000.3, 3, v3000-py3]
4271-
- [oraclelinux , 7 , 3000.3, 3, v3000-py3]
4272-
- [ubuntu , 18.04, 3000.3, 2, v3000-py2]
4273-
# - [ubuntu , 16.04, 3000.3, 2, v3000-py2]
4243+
- [debian , 10 , 3002.2, 3, v3002-py3]
4244+
- [debian , 9 , 3002.2, 3, v3002-py3]
4245+
- [ubuntu , 20.04, 3002.2, 3, v3002-py3]
4246+
- [ubuntu , 18.04, 3002.2, 3, v3002-py3]
4247+
- [ubuntu , 16.04, 3002.2, 3, v3002-py3]
4248+
- [centos , 8 , 3002.2, 3, v3002-py3]
4249+
- [centos , 7 , 3002.2, 3, v3002-py3]
4250+
- [fedora , 33 , 3002.2, 3, v3002-py3]
4251+
# # Still installs `3001.4-1.fc32`
4252+
# # - [fedora , 32 , 3002.2, 3, v3002-py3]
4253+
# # Still installs `3000.3-lp152.4.1`
4254+
# # - [opensuse/leap, 15.2 , 3002.2, 3, v3002-py3]
4255+
- [amazonlinux , 2 , 3002.2, 3, v3002-py3]
4256+
- [oraclelinux , 8 , 3002.2, 3, v3002-py3]
4257+
- [oraclelinux , 7 , 3002.2, 3, v3002-py3]
4258+
# # - [arch-base , latest, 3002.2, 3, v3002-py3]
4259+
- [gentoo/stage3, latest, 3002.2, 3, v3002-py3]
4260+
- [gentoo/stage3, systemd, 3002.2, 3, v3002-py3]
4261+
- [debian , 10 , 3001.4, 3, v3001-py3]
4262+
# - [debian , 9 , 3001.4, 3, v3001-py3]
4263+
- [ubuntu , 20.04, 3001.4, 3, v3001-py3]
4264+
# - [ubuntu , 18.04, 3001.4, 3, v3001-py3]
4265+
# - [ubuntu , 16.04, 3001.4, 3, v3001-py3]
4266+
- [centos , 8 , 3001.4, 3, v3001-py3]
4267+
# - [centos , 7 , 3001.4, 3, v3001-py3]
4268+
# # Probably doesn't work with Python 3.9
4269+
# # - [fedora , 33 , 3001.4, 3, v3001-py3]
4270+
- [fedora , 32 , 3001.4, 3, v3001-py3]
4271+
# # Still installs `3000.3-lp152.4.1`
4272+
# # - [opensuse/leap, 15.2 , 3001.4, 3, v3001-py3]
4273+
# - [amazonlinux , 2 , 3001.4, 3, v3001-py3]
4274+
- [oraclelinux , 8 , 3001.4, 3, v3001-py3]
4275+
# - [oraclelinux , 7 , 3001.4, 3, v3001-py3]
4276+
# # - [arch-base , latest, 3001.4, 3, v3001-py3]
4277+
# - [gentoo/stage3, latest, 3001.4, 3, v3001-py3]
4278+
# - [gentoo/stage3, systemd, 3001.4, 3, v3001-py3]
4279+
# - [debian , 10 , 3000.6, 3, v3000-py3]
4280+
- [debian , 9 , 3000.6, 3, v3000-py3]
4281+
- [ubuntu , 18.04, 3000.6, 3, v3000-py3]
4282+
# - [ubuntu , 16.04, 3000.6, 3, v3000-py3]
4283+
# - [centos , 8 , 3000.6, 3, v3000-py3]
4284+
- [centos , 7 , 3000.6, 3, v3000-py3]
4285+
- [opensuse/leap, 15.2 , 3000.6, 3, v3000-py3]
4286+
# - [amazonlinux , 2 , 3000.6, 3, v3000-py3]
4287+
# - [oraclelinux , 8 , 3000.6, 3, v3000-py3]
4288+
- [oraclelinux , 7 , 3000.6, 3, v3000-py3]
4289+
# - [gentoo/stage3, latest, 3000.6, 3, v3000-py3]
4290+
# - [gentoo/stage3, systemd, 3000.6, 3, v3000-py3]
4291+
# - [ubuntu , 18.04, 3000.6, 2, v3000-py2]
4292+
- [ubuntu , 16.04, 3000.6, 2, v3000-py2]
4293+
# # - [arch-base , latest, 3000.6, 2, v3000-py2]
42744294
use_tofs: true
42754295
yamllint:
42764296
ignore:

0 commit comments

Comments
 (0)