From 206a233c7ee5a2c9cba73cda5738f6280e7d5b33 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 1 Jun 2020 23:10:35 +0100 Subject: [PATCH] feat(systemd): use latest pre-salted images * Avoid `[skip ci]` since extra commit required to work with new platforms --- ssf/defaults.yaml | 2 +- ssf/formulas.yaml | 51 ++++++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 2d323b58..f91eefa4 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -56,7 +56,7 @@ ssf_node_anchors: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length rule:quoted-strings title: "ci(kitchen+travis): use latest pre-salted images" - body: '* Automated using https://github.com/myii/ssf-formula/pull/212' + body: '* Automated using https://github.com/myii/ssf-formula/pull/213' # yamllint enable rule:line-length rule:quoted-strings github: owner: 'saltstack-formulas' diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 21b4feb0..d6da251e 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -315,8 +315,6 @@ ssf_node_anchors: - [amazonlinux , 2 , 2019.2, 3, default] - [fedora , 30 , 2018.3, 3, default] - [arch-base , latest, 2018.3, 2, default] - # - [centos , 6 , 2017.7, 2, default] - # - [amazonlinux , 1 , 2017.7, 2, default] platforms_matrix_without_arch: &platforms_matrix_without_arch # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] @@ -3433,36 +3431,49 @@ ssf: - 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.1 , 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.1 , 2019.2, 3] + - [opensuse/leap, 15.2 , 2019.2, 3] - [amazonlinux , 2 , 2019.2, 3] - - [centos , 7 , 2019.2, 2] # CHECK + # - [centos , 6 , 2019.2, 2] + # - [amazonlinux , 1 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] - - [fedora , 30 , 2018.3, 3] - - [debian , 9 , 2018.3, 2] - - [ubuntu , 16.04, 2018.3, 2] - - [centos , 7 , 2018.3, 2] - - [opensuse/leap, 15.1 , 2018.3, 2] - # - [amazonlinux , 1 , 2018.3, 2] - - [arch-base , latest, 2018.3, 2] - - [debian , 8 , 2017.7, 2] - - [ubuntu , 16.04, 2017.7, 2] - # - [centos , 6 , 2017.7, 2] - - [fedora , 30 , 2017.7, 2] - - [opensuse/leap, 15.1 , 2017.7, 2] - # - [amazonlinux , 1 , 2017.7, 2] - - [arch-base , latest, 2017.7, 2] - platforms_matrix: *platforms_matrix_systemd_only + 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] + - [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] use_tofs: true semrel_files: *semrel_files_default telegraf: