From 23f3b80f3d46d9720489e0774d61cbac4c75a263 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 18 Aug 2019 21:04:35 +0100 Subject: [PATCH] feat(formulas): replace EOL pre-salted images * Based on the discussions in the following merged PR: - https://github.com/saltstack-formulas/template-formula/pull/148 * Applied changes to all relevant formulas except the `ufw-formula`: - Some underlying problem there causing failures - Perhaps related to still needing to use `dist: trusty` (Travis) --- ssf/defaults.yaml | 4 +- ssf/formulas.yaml | 476 ++++++++++++++++++++-------------------------- 2 files changed, 210 insertions(+), 270 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 1c2caa6a..8b0a4436 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -14,8 +14,8 @@ ssf_node_anchors: # release phase via. `pre-commit_semantic-release.sh` # An alternative method could be to use: # `git describe --abbrev=0 --tags` - title: 'fix(yamllint): use separate suite for `ubuntu`' - body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/18' + title: 'ci(kitchen+travis): replace EOL pre-salted images' + body: '* Automated using https://github.com/myii/ssf-formula/pull/16' github: owner: saltstack-formulas repo: '' diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 68f0fc10..33a4b83a 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -16,111 +16,118 @@ ssf_node_anchors: supports_debian_ubuntu: &supports_debian_ubuntu - debian - ubuntu - platforms_old: &platforms_old + platforms_osfamily_debian: &platforms_osfamily_debian # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , develop, 3] + - [debian , 10 , develop, 3] - [ubuntu , 18.04, develop, 3] - - [centos , 7 , develop, 3] - - [fedora , 29 , develop, 3] - - [opensuse/leap, 15 , develop, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - - [centos , 7 , 2019.2, 3] - - [fedora , 29 , 2019.2, 3] - - [opensuse/leap, 15 , 2019.2, 3] - [debian , 9 , 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - - [centos , 7 , 2018.3, 2] - - [fedora , 29 , 2018.3, 2] - - [opensuse/leap, 42 , 2018.3, 2] - [debian , 8 , 2017.7, 2] - [ubuntu , 16.04, 2017.7, 2] - - [centos , 6 , 2017.7, 2] - - [fedora , 28 , 2017.7, 2] - - [opensuse/leap, 42 , 2017.7, 2] - platforms_matrix_old: &platforms_matrix_old - # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] - - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 42 , 2018.3, 2, default] - - [centos , 6 , 2017.7, 2, default] - platforms_old_osfamily_debian: &platforms_old_osfamily_debian - # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , develop, 3] - - [ubuntu , 18.04, develop, 3] - - [debian , 9 , 2019.2, 3] - - [ubuntu , 18.04, 2019.2, 3] - - [debian , 9 , 2018.3, 2] - - [ubuntu , 16.04, 2018.3, 2] - - [debian , 8 , 2017.7, 2] - - [ubuntu , 16.04, 2017.7, 2] - platforms_old_osfamily_redhat: &platforms_old_osfamily_redhat + platforms_osfamily_redhat: &platforms_osfamily_redhat # [os , os_ver, salt_ver, py_ver] - [centos , 7 , develop, 3] - - [fedora , 29 , develop, 3] + - [fedora , 30 , develop, 3] + - [amazonlinux , 2 , develop, 2] - [centos , 7 , 2019.2, 3] - - [fedora , 29 , 2019.2, 3] + - [fedora , 30 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 2] - [centos , 7 , 2018.3, 2] - [fedora , 29 , 2018.3, 2] + - [amazonlinux , 2 , 2018.3, 2] - [centos , 6 , 2017.7, 2] - - [fedora , 28 , 2017.7, 2] - platforms_old_osfamily_suse: &platforms_old_osfamily_suse + - [fedora , 29 , 2017.7, 2] + - [amazonlinux , 2 , 2017.7, 2] + platforms_osfamily_suse: &platforms_osfamily_suse # [os , os_ver, salt_ver, py_ver] - [opensuse/leap, 15 , develop, 3] - [opensuse/leap, 15 , 2019.2, 3] - - [opensuse/leap, 42 , 2018.3, 2] - - [opensuse/leap, 42 , 2017.7, 2] - platforms_old_os_debian: &platforms_old_os_debian + - [opensuse/leap, 15 , 2018.3, 2] + - [opensuse/leap, 15 , 2017.7, 2] + platforms_os_debian: &platforms_os_debian # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , develop, 3] + - [debian , 10 , develop, 3] - [debian , 9 , 2019.2, 3] - [debian , 9 , 2018.3, 2] - [debian , 8 , 2017.7, 2] - platforms_old_os_ubuntu: &platforms_old_os_ubuntu + platforms_os_ubuntu: &platforms_os_ubuntu # [os , os_ver, salt_ver, py_ver] - [ubuntu , 18.04, develop, 3] - [ubuntu , 18.04, 2019.2, 3] - [ubuntu , 16.04, 2018.3, 2] - [ubuntu , 16.04, 2017.7, 2] - platforms_old_os_ubuntu18: &platforms_old_os_ubuntu18 + # platforms_os_ubuntu18: &platforms_os_ubuntu18 + # # [os , os_ver, salt_ver, py_ver] + # - [ubuntu , 18.04, develop, 3] + # - [ubuntu , 18.04, 2019.2, 3] + # platforms_os_ubuntu16: &platforms_os_ubuntu16 + # # [os , os_ver, salt_ver, py_ver] + # - [ubuntu , 16.04, 2018.3, 2] + # - [ubuntu , 16.04, 2017.7, 2] + platforms_os_fedora: &platforms_os_fedora # [os , os_ver, salt_ver, py_ver] - - [ubuntu , 18.04, develop, 3] - - [ubuntu , 18.04, 2019.2, 3] - platforms_old_os_ubuntu16: &platforms_old_os_ubuntu16 - # [os , os_ver, salt_ver, py_ver] - - [ubuntu , 16.04, 2018.3, 2] - - [ubuntu , 16.04, 2017.7, 2] - platforms_old_os_fedora: &platforms_old_os_fedora - # [os , os_ver, salt_ver, py_ver] - - [fedora , 29 , develop, 3] - - [fedora , 29 , 2019.2, 3] + - [fedora , 30 , develop, 3] + - [fedora , 30 , 2019.2, 3] - [fedora , 29 , 2018.3, 2] - - [fedora , 28 , 2017.7, 2] - platforms_old_os_suse: &platforms_old_os_suse - # [os , os_ver, salt_ver, py_ver] - - [opensuse/leap, 15 , develop, 3] - - [opensuse/leap, 15 , 2019.2, 3] - - [opensuse/leap, 42 , 2018.3, 2] - - [opensuse/leap, 42 , 2017.7, 2] - platforms_old_os_centos: &platforms_old_os_centos - # [os , os_ver, salt_ver, py_ver] - - [centos , 7 , develop, 3] - - [centos , 7 , 2019.2, 3] - - [centos , 7 , 2018.3, 2] - - [centos , 6 , 2017.7, 2] - platforms_old_os_centos6: &platforms_old_os_centos6 + - [fedora , 29 , 2017.7, 2] + # platforms_os_suse: &platforms_os_suse + # # [os , os_ver, salt_ver, py_ver] + # - [opensuse/leap, 15 , develop, 3] + # - [opensuse/leap, 15 , 2019.2, 3] + # - [opensuse/leap, 15 , 2018.3, 2] + # - [opensuse/leap, 15 , 2017.7, 2] + # platforms_os_centos: &platforms_os_centos + # # [os , os_ver, salt_ver, py_ver] + # - [centos , 7 , develop, 3] + # - [centos , 7 , 2019.2, 3] + # - [centos , 7 , 2018.3, 2] + # - [centos , 6 , 2017.7, 2] + platforms_os_centos6: &platforms_os_centos6 # [os , os_ver, salt_ver, py_ver] - [centos , 6 , 2017.7, 2] - platforms_matrix_old_osfamily_suites: &platforms_matrix_old_osfamily_suites + # platforms_os_amazonlinux: &platforms_os_amazonlinux + # # [os , os_ver, salt_ver, py_ver] + # - [amazonlinux , 2 , develop, 2] + # - [amazonlinux , 2 , 2019.2, 2] + # - [amazonlinux , 2 , 2018.3, 2] + # - [amazonlinux , 2 , 2017.7, 2] + platforms_matrix_osfamily_suites: &platforms_matrix_osfamily_suites + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, debian] + - [ubuntu , 18.04, 2019.2, 3, debian] + - [amazonlinux , 2 , 2019.2, 2, redhat] + - [fedora , 29 , 2018.3, 2, redhat] + - [opensuse/leap, 15 , 2018.3, 2, suse] + - [centos , 6 , 2017.7, 2, redhat] + # yamllint disable-line rule:line-length + platforms_matrix_osfamily_suites_without_amz: &platforms_matrix_osfamily_suites_without_amz # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, debian] + - [debian , 10 , develop, 3, debian] - [ubuntu , 18.04, 2019.2, 3, debian] - [centos , 7 , 2019.2, 3, redhat] - [fedora , 29 , 2018.3, 2, redhat] - - [opensuse/leap, 42 , 2018.3, 2, suse] + - [opensuse/leap, 15 , 2018.3, 2, suse] - [centos , 6 , 2017.7, 2, redhat] + platforms_matrix_osfamily_debian: &platforms_matrix_osfamily_debian + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, default] + - [ubuntu , 18.04, develop, 3, default] + - [debian , 9 , 2019.2, 3, default] + - [ubuntu , 18.04, 2019.2, 3, default] + - [debian , 9 , 2018.3, 2, default] + - [ubuntu , 16.04, 2017.7, 2, default] + platforms_matrix_systemd_only: &platforms_matrix_systemd_only + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, default] + - [ubuntu , 18.04, 2019.2, 3, default] + - [centos , 7 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] + - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] + # - [centos , 6 , 2017.7, 2, default] + - [amazonlinux , 2 , 2017.7, 2, default] yamllint: rules: rule: @@ -202,10 +209,9 @@ ssf: inspec_suites_matrix: - repositories - preferences - old_ci_files: true platforms: # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , develop, 3] + - [debian , 10 , develop, 3] - [ubuntu , 18.04, develop, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] @@ -215,7 +221,7 @@ ssf: # - [ubuntu , 16.04, 2017.7, 2] platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, repositories] + - [debian , 10 , develop, 3, repositories] # - [ubuntu , 18.04, develop, 3, repositories] - [debian , 9 , 2019.2, 3, repositories] - [ubuntu , 18.04, 2019.2, 3, repositories] @@ -241,9 +247,6 @@ ssf: - '*': - . - .config - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old yamllint: rules: comments-indentation: @@ -275,9 +278,6 @@ ssf: - '*': - states/setup-certs-to-remove - . - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old semrel_files: *semrel_files_default chrony: context: @@ -289,16 +289,6 @@ ssf: inspec_yml: summary: >- Verify that the chrony formula is setup and configured correctly - old_ci_files: true - platforms: *platforms_old - platforms_matrix: - # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] - - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - # - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 42 , 2018.3, 2, default] - - [centos , 6 , 2017.7, 2, default] use_tofs: true semrel_files: *semrel_files_default collectd: @@ -314,9 +304,15 @@ ssf: provisioner: pillars_from_files: - .sls: test/salt/default/pillar/collectd.sls - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old + platforms_matrix: + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, default] + - [ubuntu , 18.04, 2019.2, 3, default] + - [centos , 7 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] + - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] + - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default cron: context: @@ -342,17 +338,34 @@ ssf: inspec_yml: summary: >- Verify that the deepsea formula is setup and configured correctly - old_ci_files: true - platforms: *platforms_old platforms_matrix: + # Note, keeping this "working out" because difficult to resolve for this repo + # One `#` where working but not using, two `# #` for not working at all # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] - - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [opensuse/leap, 15 , 2019.2, 3, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 42 , 2018.3, 2, default] - # - [centos , 6 , 2017.7, 2, default] + # # - [debian , 10 , develop, 3, default] + - [ubuntu , 18.04, develop, 3, default] + # - [centos , 7 , develop, 3, default] + # - [fedora , 30 , develop, 3, default] + # - [opensuse/leap, 15 , develop, 3, default] + # # - [amazonlinux , 2 , develop, 2, default] + - [debian , 9 , 2019.2, 3, default] + # - [ubuntu , 18.04, 2019.2, 3, default] + # - [centos , 7 , 2019.2, 3, default] + - [fedora , 30 , 2019.2, 3, default] + # # - [opensuse/leap, 15 , 2019.2, 3, default] + # # - [amazonlinux , 2 , 2019.2, 2, default] + # # - [debian , 9 , 2018.3, 2, default] + # # - [ubuntu , 16.04, 2018.3, 2, default] + - [centos , 7 , 2018.3, 2, default] + # - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] + # # - [amazonlinux , 2 , 2018.3, 2, default] + # # - [debian , 8 , 2017.7, 2, default] + # # - [ubuntu , 16.04, 2017.7, 2, default] + # # - [centos , 6 , 2017.7, 2, default] + - [fedora , 29 , 2017.7, 2, default] + # - [opensuse/leap, 15 , 2017.7, 2, default] + # # - [amazonlinux , 2 , 2017.7, 2, default] use_tofs: true semrel_files: *semrel_files_default dhcpd: @@ -375,14 +388,14 @@ ssf: state_top: - '*': - .config - old_ci_files: true - platforms: *platforms_old platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] + - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [debian , 9 , 2018.3, 2, default] + - [amazonlinux , 2 , 2019.2, 2, default] + - [centos , 7 , 2018.3, 2, default] + # - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default fail2ban: @@ -403,9 +416,16 @@ ssf: - '*': - misc.fake_log_files - . - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old + platforms_matrix: + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, default] + - [ubuntu , 18.04, 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] + - [fedora , 30 , 2019.2, 3, default] + - [centos , 7 , 2018.3, 2, default] + # - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] + - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default golang: context: @@ -417,10 +437,16 @@ ssf: inspec_yml: summary: >- Verify that the golang formula is setup and configured correctly - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old use_tofs: true + platforms_matrix: + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, default] + - [ubuntu , 18.04, 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] + - [debian , 9 , 2018.3, 2, default] + - [fedora , 29 , 2018.3, 2, default] + # - [opensuse/leap, 15 , 2018.3, 2, default] + - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default grafana: context: @@ -432,16 +458,7 @@ ssf: inspec_yml: summary: >- Verify that the grafana formula is setup and configured correctly - old_ci_files: true - platforms: *platforms_old - platforms_matrix: - # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] - - [ubuntu , 18.04, develop, 3, default] - - [debian , 9 , 2019.2, 3, default] - - [ubuntu , 18.04, 2019.2, 3, default] - - [debian , 9 , 2018.3, 2, default] - - [ubuntu , 16.04, 2017.7, 2, default] + platforms_matrix: *platforms_matrix_osfamily_debian use_tofs: true semrel_files: *semrel_files_default influxdb: @@ -457,9 +474,6 @@ ssf: provisioner: pillars_from_files: - .sls: test/salt/pillar/influxdb.sls - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old semrel_files: *semrel_files_default iptables: context: @@ -489,16 +503,15 @@ ssf: inspec_suites_matrix: - default - tables - old_ci_files: true - platforms: *platforms_old platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] + - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 42 , 2018.3, 2, default] - - [opensuse/leap, 42 , 2017.7, 2, tables] + - [centos , 7 , 2018.3, 2, default] + # - [centos , 6 , 2017.7, 2, default] + - [opensuse/leap, 15 , 2017.7, 2, tables] yamllint: rules: key-duplicates: @@ -514,9 +527,6 @@ ssf: inspec_yml: summary: >- Verify that the keepalived formula is setup and configured correctly - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old script_kitchen: pre: - sudo modprobe ip_vs @@ -543,37 +553,17 @@ ssf: - centos - fedora - opensuse - old_ci_files: true - platforms: - # [os , os_ver, salt_ver, py_ver] - - [amazonlinux , 2 , develop, 2] - - [debian , 9 , 2019.2, 3] - - [ubuntu , 18.04, 2019.2, 3] - - [centos , 7 , 2019.2, 3] - - [fedora , 29 , 2019.2, 3] - - [opensuse/leap, 15 , 2019.2, 3] - - [amazonlinux , 2 , 2019.2, 2] - - [debian , 9 , 2018.3, 2] - - [ubuntu , 16.04, 2018.3, 2] - - [centos , 7 , 2018.3, 2] - - [fedora , 29 , 2018.3, 2] - - [opensuse/leap, 42 , 2018.3, 2] - - [debian , 8 , 2017.7, 2] - - [ubuntu , 16.04, 2017.7, 2] - - [centos , 6 , 2017.7, 2] - - [fedora , 28 , 2017.7, 2] - - [opensuse/leap, 42 , 2017.7, 2] - - [amazonlinux , 2 , 2017.7, 2] platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - # - [amazonlinux , 2 , develop, 2, default] + - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] + - [fedora , 30 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] - - [debian , 9 , 2018.3, 2, default] - [centos , 7 , 2018.3, 2, default] - # - [ubuntu , 16.04, 2017.7, 2, default] - - [fedora , 28 , 2017.7, 2, default] - # - [amazonlinux , 2 , 2017.7, 2, default] + # - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] + - [fedora , 29 , 2017.7, 2, default] + # - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default locale: context: @@ -582,7 +572,7 @@ ssf: repo: locale-formula inspec_suites_kitchen: 0: - excludes: *platforms_old_os_fedora + excludes: *platforms_os_fedora inspec_yml: summary: >- Verify that the locale formula is setup and configured correctly @@ -590,7 +580,7 @@ ssf: pillars_from_files: - .sls: test/salt/pillar/default.sls 1: - includes: *platforms_old_os_fedora + includes: *platforms_os_fedora provisioner: pillars_from_files: - .sls: test/salt/pillar/fedora.sls @@ -599,15 +589,14 @@ ssf: inspec_suites_matrix: - default - fedora - old_ci_files: true - platforms: *platforms_old platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] + - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, fedora] - - [opensuse/leap, 42 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default logrotate: @@ -630,9 +619,6 @@ ssf: - '*': - . - .jobs - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old semrel_files: *semrel_files_default mysql: context: @@ -672,9 +658,15 @@ ssf: provisioner: pillars_from_files: - .sls: test/salt/default/pillar/nginx.sls - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old + platforms_matrix: + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , develop, 3, default] + - [ubuntu , 18.04, 2019.2, 3, default] + - [centos , 7 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] + - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] + - [centos , 6 , 2017.7, 2, default] use_tofs: true semrel_files: *semrel_files_default openvpn: @@ -693,14 +685,15 @@ ssf: state_top: - '*': - .config - old_ci_files: true - platforms: *platforms_old platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] - - [debian , 9 , 2019.2, 3, default] + - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] + - [debian , 9 , 2018.3, 2, default] + # - [fedora , 29 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default php: @@ -718,7 +711,7 @@ ssf: provisioner: pillars_from_files: [] 1: - includes: *platforms_old_os_debian + includes: *platforms_os_debian provisioner: pillars_from_files: - .sls: test/salt/pillar/debian.sls @@ -733,7 +726,7 @@ ssf: verifier: test_suite: default 2: - includes: *platforms_old_os_ubuntu + includes: *platforms_os_ubuntu provisioner: pillars: - '*': @@ -753,14 +746,14 @@ ssf: verifier: test_suite: default 3: - includes: *platforms_old_osfamily_redhat + includes: *platforms_osfamily_redhat provisioner: pillars_from_files: - .sls: test/salt/pillar/redhat.sls verifier: test_suite: default 4: - includes: *platforms_old_osfamily_suse + includes: *platforms_osfamily_suse provisioner: pillars_from_files: - .sls: test/salt/pillar/suse.sls @@ -772,15 +765,12 @@ ssf: - ubuntu - redhat - suse - old_ci_files: true - platforms: *platforms_old platforms_matrix: - # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, debian] + - [debian , 10 , develop, 3, debian] - [ubuntu , 18.04, 2019.2, 3, ubuntu] - - [centos , 7 , 2019.2, 3, redhat] + - [amazonlinux , 2 , 2019.2, 2, redhat] - [fedora , 29 , 2018.3, 2, redhat] - - [opensuse/leap, 42 , 2018.3, 2, suse] + - [opensuse/leap, 15 , 2018.3, 2, suse] - [centos , 6 , 2017.7, 2, redhat] semrel_files: *semrel_files_default postfix: @@ -800,9 +790,6 @@ ssf: - '*': - . - .config - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old yamllint: rules: key-duplicates: @@ -821,15 +808,13 @@ ssf: provisioner: pillars_from_files: - .sls: test/salt/pillar/postgres.sls - old_ci_files: true - platforms: *platforms_old platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] + - [debian , 10 , develop, 3, default] - [centos , 7 , 2019.2, 3, default] - - [fedora , 29 , 2019.2, 3, default] + - [fedora , 30 , 2019.2, 3, default] - [ubuntu , 16.04, 2018.3, 2, default] - - [opensuse/leap, 42 , 2018.3, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] use_tofs: true yamllint: @@ -851,16 +836,7 @@ ssf: inspec_yml: summary: >- Verify that the prometheus formula is setup and configured correctly - old_ci_files: true - platforms: *platforms_old - platforms_matrix: - # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] - - [ubuntu , 18.04, develop, 3, default] - - [debian , 9 , 2019.2, 3, default] - - [ubuntu , 18.04, 2019.2, 3, default] - - [debian , 9 , 2018.3, 2, default] - - [ubuntu , 16.04, 2017.7, 2, default] + platforms_matrix: *platforms_matrix_osfamily_debian use_tofs: true semrel_files: *semrel_files_default rkhunter: @@ -878,21 +854,21 @@ ssf: provisioner: pillars_from_files: [] 1: - includes: *platforms_old_osfamily_debian + includes: *platforms_osfamily_debian provisioner: pillars_from_files: - .sls: test/salt/pillar/debian.sls verifier: test_suite: default 2: - includes: *platforms_old_osfamily_redhat + includes: *platforms_osfamily_redhat provisioner: pillars_from_files: - .sls: test/salt/pillar/redhat.sls verifier: test_suite: default 3: - includes: *platforms_old_osfamily_suse + includes: *platforms_osfamily_suse provisioner: pillars_from_files: - .sls: test/salt/pillar/suse.sls @@ -903,9 +879,7 @@ ssf: - debian - redhat - suse - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old_osfamily_suites + platforms_matrix: *platforms_matrix_osfamily_suites_without_amz use_cirrus_ci: true use_tofs: true semrel_files: *semrel_files_default @@ -997,9 +971,6 @@ ssf: - '*': - . - .included - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old semrel_files: *semrel_files_default sysctl: context: @@ -1037,15 +1008,14 @@ ssf: state_top: - '*': - .config - old_ci_files: true - platforms: *platforms_old platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] + - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, develop, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [debian , 9 , 2018.3, 2, default] + # - [ubuntu , 16.04, 2017.7, 2, default] use_cirrus_ci: true yamllint: check_files: @@ -1069,9 +1039,6 @@ ssf: inspec_yml: summary: >- Verify that the sysstat formula is setup and configured correctly - old_ci_files: true - platforms: *platforms_old - platforms_matrix: *platforms_matrix_old use_tofs: true semrel_files: *semrel_files_default systemd: @@ -1091,37 +1058,33 @@ ssf: - .networkd - .networkd.profiles - .units - old_ci_files: true platforms: # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , develop, 3] + - [debian , 10 , develop, 3] - [ubuntu , 18.04, develop, 3] - [centos , 7 , develop, 3] - - [fedora , 29 , develop, 3] + - [fedora , 30 , develop, 3] - [opensuse/leap, 15 , develop, 3] + - [amazonlinux , 2 , develop, 2] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 7 , 2019.2, 3] - - [fedora , 29 , 2019.2, 3] + - [fedora , 30 , 2019.2, 3] - [opensuse/leap, 15 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 2] - [debian , 9 , 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - [centos , 7 , 2018.3, 2] - [fedora , 29 , 2018.3, 2] - - [opensuse/leap, 42 , 2018.3, 2] + - [opensuse/leap, 15 , 2018.3, 2] + - [amazonlinux , 2 , 2018.3, 2] - [debian , 8 , 2017.7, 2] - [ubuntu , 16.04, 2017.7, 2] # - [centos , 6 , 2017.7, 2] - - [fedora , 28 , 2017.7, 2] - - [opensuse/leap, 42 , 2017.7, 2] - platforms_matrix: - # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] - - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 42 , 2018.3, 2, default] - - [debian , 8 , 2017.7, 2, default] + - [fedora , 29 , 2017.7, 2] + - [opensuse/leap, 15 , 2017.7, 2] + - [amazonlinux , 2 , 2017.7, 2] + platforms_matrix: *platforms_matrix_systemd_only use_tofs: true semrel_files: *semrel_files_default template: @@ -1133,7 +1096,7 @@ ssf: repo: template-formula inspec_suites_kitchen: 0: - excludes: *platforms_old_os_centos6 + excludes: *platforms_os_centos6 inspec_yml: summary: >- Verify that the template formula is setup and configured correctly @@ -1146,7 +1109,7 @@ ssf: - .sls: pillar.example - define_roles.sls: test/salt/pillar/define_roles.sls 1: - includes: *platforms_old_os_centos6 + includes: *platforms_os_centos6 provisioner: pillars: - '*': @@ -1197,16 +1160,16 @@ ssf: provisioner: pillars_from_files: - .sls: test/salt/pillar/default.sls - old_ci_files: true - platforms: *platforms_old platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, default] + - [debian , 10 , develop, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 42 , 2018.3, 2, default] - - [debian , 8 , 2017.7, 2, default] + - [opensuse/leap, 15 , 2018.3, 2, default] + # - [centos , 6 , 2017.7, 2, default] + # - [amazonlinux , 2 , 2017.7, 2, default] travis: # Facing errors with `xenial` at time of adding # https://travis-ci.org/myii/ufw-formula/jobs/561205378#L906 @@ -1261,37 +1224,14 @@ ssf: - .sls: test/salt/pillar/prod_server.sls inspec_suites_matrix: - '' - old_ci_files: true - platforms: - # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , develop, 3] - - [ubuntu , 18.04, develop, 3] - - [centos , 7 , develop, 3] - - [fedora , 30 , develop, 3] - - [opensuse/leap, 15 , develop, 3] - - [debian , 9 , 2019.2, 3] - - [ubuntu , 18.04, 2019.2, 3] - - [centos , 7 , 2019.2, 3] - - [fedora , 30 , 2019.2, 3] - - [opensuse/leap, 15 , 2019.2, 3] - - [debian , 9 , 2018.3, 2] - - [ubuntu , 16.04, 2018.3, 2] - - [centos , 7 , 2018.3, 2] - - [fedora , 29 , 2018.3, 2] - - [opensuse/leap, 42 , 2018.3, 2] - - [debian , 8 , 2017.7, 2] - - [ubuntu , 16.04, 2017.7, 2] - - [centos , 6 , 2017.7, 2] - - [fedora , 29 , 2017.7, 2] - - [opensuse/leap, 15 , 2017.7, 2] platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [debian , 9 , develop, 3, ''] + - [debian , 10 , develop, 3, ''] - [ubuntu , 18.04, 2019.2, 3, ''] - - [centos , 7 , 2019.2, 3, ''] + - [amazonlinux , 2 , 2019.2, 2, ''] - [fedora , 29 , 2018.3, 2, ''] - - [opensuse/leap, 42 , 2018.3, 2, ''] - - [debian , 8 , 2017.7, 2, ''] + - [opensuse/leap, 15 , 2018.3, 2, ''] + - [centos , 6 , 2017.7, 2, ''] script_kitchen: cmd: test semrel_files: *semrel_files_default