Skip to content

Commit

Permalink
feat(systemd): use platforms_new_inc_tiamat
Browse files Browse the repository at this point in the history
  • Loading branch information
@myii
myii committed Sep 20, 2020
1 parent cb41dd7 commit 15e34e1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 43 deletions.
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length rule:quoted-strings
title: "chore: standardise structure"
body: '* Automated using https://github.com/myii/ssf-formula/pull/253'
title: "ci(kitchen+travis): use '`'tiamat'`' pre-salted images [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/255'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down
55 changes: 14 additions & 41 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4272,50 +4272,23 @@ ssf:
- .journald
- rsync_test_package
- .units
platforms:
# Based on `*platforms_new`
# [os , os_ver, salt_ver, py_ver]
- [debian , 10 , master, 3]
- [ubuntu , 20.04, master, 3]
- [ubuntu , 18.04, master, 3]
- [centos , 8 , master, 3]
- [fedora , 32 , master, 3]
- [fedora , 31 , master, 3]
- [opensuse/leap, 15.2 , master, 3]
- [amazonlinux , 2 , master, 3]
- [debian , 10 , 3000.3, 3]
- [debian , 9 , 3000.3, 3]
- [ubuntu , 18.04, 3000.3, 3]
- [centos , 8 , 3000.3, 3]
- [centos , 7 , 3000.3, 3]
- [fedora , 31 , 3000.3, 3]
- [opensuse/leap, 15.2 , 3000.3, 3]
- [amazonlinux , 2 , 3000.3, 3]
- [ubuntu , 18.04, 3000.3, 2]
- [ubuntu , 16.04, 3000.3, 2]
- [arch-base , latest, 3000.3, 2]
- [debian , 10 , 2019.2, 3]
- [debian , 9 , 2019.2, 3]
- [ubuntu , 18.04, 2019.2, 3]
- [ubuntu , 16.04, 2019.2, 3]
- [centos , 8 , 2019.2, 3]
- [centos , 7 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [opensuse/leap, 15.2 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 3]
# - [centos , 6 , 2019.2, 2]
# - [amazonlinux , 1 , 2019.2, 2]
- [arch-base , latest, 2019.2, 2]
platforms: *platforms_new_inc_tiamat
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , master, 3, default]
- [ubuntu , 20.04, master, 3, default]
# # - [centos , 8 , master, 3, default]
- [debian , 10 , tiamat, 3, default]
# - [debian , 9 , tiamat, 3, default]
- [ubuntu , 20.04, tiamat, 3, default]
# - [ubuntu , 18.04, tiamat, 3, default]
# - [ubuntu , 16.04, tiamat, 3, default]
# # - [centos , 8 , tiamat, 3, default]
- [centos , 7 , tiamat, 3, default]
- [amazonlinux , 2 , tiamat, 3, default]
# # - [oraclelinux , 8 , tiamat, 3, default]
# # - [oraclelinux , 7 , tiamat, 3, default]
- [fedora , 32 , master, 3, default]
- [centos , 7 , 3000.3, 3, default]
- [opensuse/leap, 15.2 , 3000.3, 3, default]
- [amazonlinux , 2 , 3000.3, 3, default]
- [arch-base , latest, 2019.2, 2, default]
# - [fedora , 31 , master, 3, default]
# # - [opensuse/leap, 15.2 , master, 3, default]
- [arch-base , latest, 3000.3, 2, default]
use_tofs: true
semrel_files: *semrel_files_default
telegraf:
Expand Down

0 comments on commit 15e34e1

Please sign in to comment.