From f1adcafd1d56dda62c9447cbfb61ab8f817998ba Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Oct 2019 23:52:14 +0100 Subject: [PATCH 01/19] refactor(formula): update all references from `develop` => `master` --- ssf/defaults.yaml | 20 ++++----- ssf/files/default/.travis.yml | 8 ++-- ssf/files/default/kitchen.yml | 8 +--- ssf/formulas.yaml | 84 +++++++++++++++++------------------ 4 files changed, 58 insertions(+), 62 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 6be7b88b..adf512ca 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -87,18 +87,18 @@ ssf_node_anchors: # as numbers (for comparisons) # [os , os_ver, salt_ver, py_ver] - ### `develop-py3` => `master-py3` + ### `master-py3` - [debian , 10 , master, 3] - # - [debian , 9 , develop, 3] # unmaintained - - [ubuntu , 18.04, develop, 3] - - [centos , 7 , develop, 3] - - [fedora , 30 , develop, 3] - # - [fedora , 29 , develop, 3] # unmaintained - - [opensuse/leap, 15 , develop, 3] + # - [debian , 9 , master, 3] # unmaintained + - [ubuntu , 18.04, master, 3] + - [centos , 7 , master, 3] + - [fedora , 30 , master, 3] + # - [fedora , 29 , master, 3] # unmaintained + - [opensuse/leap, 15 , master, 3] - ### `develop-py2` - - [amazonlinux , 2 , develop, 2] - - [arch-base , latest, develop, 2] + ### ` master-py2` + - [amazonlinux , 2 , master, 2] + - [arch-base , latest, master, 2] ### `2019.2-py3` - [debian , 9 , 2019.2, 3] # unmaintained (resolve) diff --git a/ssf/files/default/.travis.yml b/ssf/files/default/.travis.yml index 7c6f4dbd..c4d1e136 100644 --- a/ssf/files/default/.travis.yml +++ b/ssf/files/default/.travis.yml @@ -68,12 +68,12 @@ script: - {{ post_cmd }} {%- endfor %} {%- if use_saltcheck %} - # If a `develop` instance, get the appropriate version of `saltcheck.py` (temporary) + # If a `master` instance, get the appropriate version of `saltcheck.py` (temporary) {%- if semrel_formula in ['cron'] %} # Likewise, use a custom `cron.py` temporarily until the upstream PR is merged: # - https://github.com/saltstack/salt/pull/55016 {%- endif %} - - if [ ! -z $(echo "${INSTANCE}" | grep \\-develop-) ]; then + - if [ ! -z $(echo "${INSTANCE}" | grep \\-master-) ]; then bin/kitchen exec "${INSTANCE}" -c "sudo curl -o \$(find /usr/lib/ -type d -name modules | grep packages/salt/modules)/saltcheck.py https://raw.githubusercontent.com/myii/salt/fix/add-retcode/salt/modules/saltcheck.py"; @@ -83,8 +83,8 @@ script: https://raw.githubusercontent.com/myii/salt/fix/add-retcode/salt/modules/cron.py"; {%- endif %} fi - # If a `develop` instance, run all of the `saltcheck` tests - - if [ ! -z $(echo "${INSTANCE}" | grep \\-develop-) ]; then + # If a `master` instance, run all of the `saltcheck` tests + - if [ ! -z $(echo "${INSTANCE}" | grep \\-master-) ]; then bin/kitchen exec "${INSTANCE}" -c "sudo salt-call --config-dir=/tmp/kitchen/etc/salt diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml index 8041518d..481a3666 100644 --- a/ssf/files/default/kitchen.yml +++ b/ssf/files/default/kitchen.yml @@ -71,8 +71,8 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') ) %} {%- do prov_cmds.append('- systemctl enable sshd.service') %} {%- endif %} -{#- Specific to `develop` (and the introduction of `master`) #} -{%- if salt_ver in ['develop', 'master'] %} +{#- Specific to `master` #} +{%- if salt_ver == 'master' %} {%- if os != 'opensuse/leap' %} {%- do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %} {%- do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %} @@ -148,12 +148,8 @@ platforms: {%- set salt_ver = platform[2] %} {%- set py_ver = platform[3] %} {#- Display comment for each section (based on Salt version) #} -{#- Temporarily need to merge `develop` and `master` until the transition is complete #} {%- set linebreak = '\n' %} {%- set comment = '`{0}`'.format(salt_ver) %} -{%- if salt_ver in ['develop', 'master'] %} -{%- set comment = '`develop` => `master`' %} -{%- endif %} {%- if loop.index0 == 0 %} {%- set linebreak = first_linebreak %} {%- endif %} diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 0d993062..7e0c702d 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -35,7 +35,7 @@ ssf_node_anchors: platforms_osfamily_debian: &platforms_osfamily_debian # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] - - [ubuntu , 18.04, develop, 3] + - [ubuntu , 18.04, master, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [debian , 9 , 2018.3, 2] @@ -44,9 +44,9 @@ ssf_node_anchors: - [ubuntu , 16.04, 2017.7, 2] platforms_osfamily_redhat: &platforms_osfamily_redhat # [os , os_ver, salt_ver, py_ver] - - [centos , 7 , develop, 3] - - [fedora , 30 , develop, 3] - - [amazonlinux , 2 , develop, 2] + - [centos , 7 , master, 3] + - [fedora , 30 , master, 3] + - [amazonlinux , 2 , master, 2] - [centos , 7 , 2019.2, 3] - [fedora , 30 , 2019.2, 3] - [amazonlinux , 2 , 2019.2, 2] @@ -58,7 +58,7 @@ ssf_node_anchors: - [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 , master, 3] - [opensuse/leap, 15 , 2019.2, 3] - [opensuse/leap, 15 , 2018.3, 2] - [opensuse/leap, 15 , 2017.7, 2] @@ -70,13 +70,13 @@ ssf_node_anchors: - [debian , 8 , 2017.7, 2] platforms_os_ubuntu: &platforms_os_ubuntu # [os , os_ver, salt_ver, py_ver] - - [ubuntu , 18.04, develop, 3] + - [ubuntu , 18.04, master, 3] - [ubuntu , 18.04, 2019.2, 3] - [ubuntu , 16.04, 2018.3, 2] - [ubuntu , 16.04, 2017.7, 2] # platforms_os_ubuntu18: &platforms_os_ubuntu18 # # [os , os_ver, salt_ver, py_ver] - # - [ubuntu , 18.04, develop, 3] + # - [ubuntu , 18.04, master, 3] # - [ubuntu , 18.04, 2019.2, 3] # platforms_os_ubuntu16: &platforms_os_ubuntu16 # # [os , os_ver, salt_ver, py_ver] @@ -84,19 +84,19 @@ ssf_node_anchors: # - [ubuntu , 16.04, 2017.7, 2] platforms_os_fedora: &platforms_os_fedora # [os , os_ver, salt_ver, py_ver] - - [fedora , 30 , develop, 3] + - [fedora , 30 , master, 3] - [fedora , 30 , 2019.2, 3] - [fedora , 29 , 2018.3, 2] - [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 , master, 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 , master, 3] # - [centos , 7 , 2019.2, 3] # - [centos , 7 , 2018.3, 2] # - [centos , 6 , 2017.7, 2] @@ -105,14 +105,14 @@ ssf_node_anchors: - [centos , 6 , 2017.7, 2] # platforms_os_amazonlinux: &platforms_os_amazonlinux # # [os , os_ver, salt_ver, py_ver] - # - [amazonlinux , 2 , develop, 2] + # - [amazonlinux , 2 , master, 2] # - [amazonlinux , 2 , 2019.2, 2] # - [amazonlinux , 2 , 2018.3, 2] # - [amazonlinux , 2 , 2017.7, 2] platforms_os_centos_and_arch: &platforms_os_centos_and_arch # [os , os_ver, salt_ver, py_ver] - - [centos , 7 , develop, 3] - - [arch-base , latest, develop, 2] + - [centos , 7 , master, 3] + - [arch-base , latest, master, 2] - [centos , 7 , 2019.2, 3] - [arch-base , latest, 2019.2, 2] - [centos , 7 , 2018.3, 2] @@ -142,7 +142,7 @@ ssf_node_anchors: platforms_matrix_osfamily_debian: &platforms_matrix_osfamily_debian # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [ubuntu , 18.04, develop, 3, default] + - [ubuntu , 18.04, master, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [debian , 9 , 2018.3, 2, default] @@ -292,7 +292,7 @@ ssf: platforms: # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] - - [ubuntu , 18.04, develop, 3] + - [ubuntu , 18.04, master, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] # - [debian , 9 , 2018.3, 2] @@ -302,11 +302,11 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, repositories] - # - [ubuntu , 18.04, develop, 3, repositories] + # - [ubuntu , 18.04, master, 3, repositories] - [debian , 9 , 2019.2, 3, repositories] - [ubuntu , 18.04, 2019.2, 3, repositories] - - [debian , 9 , develop, 3, preferences] - # - [ubuntu , 18.04, develop, 3, preferences] + - [debian , 9 , master, 3, preferences] + # - [ubuntu , 18.04, master, 3, preferences] - [debian , 9 , 2019.2, 3, preferences] - [ubuntu , 18.04, 2019.2, 3, preferences] rubocop: @@ -456,12 +456,12 @@ ssf: # One `#` where working but not using, two `# #` for not working at all # [os , os_ver, salt_ver, py_ver, inspec_suite] # # - [debian , 10 , master, 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] - # # - [arch-base , latest, develop, 2, default] + - [ubuntu , 18.04, master, 3, default] + # - [centos , 7 , master, 3, default] + # - [fedora , 30 , master, 3, default] + # - [opensuse/leap, 15 , master, 3, default] + # # - [amazonlinux , 2 , master, 2, default] + # # - [arch-base , latest, master, 2, default] - [debian , 9 , 2019.2, 3, default] # - [ubuntu , 18.04, 2019.2, 3, default] # - [centos , 7 , 2019.2, 3, default] @@ -747,7 +747,7 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [centos , 7 , develop, 3, centarch] + - [centos , 7 , master, 3, centarch] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 7 , 2019.2, 3, centarch] - [opensuse/leap, 15 , 2019.2, 3, default] @@ -993,8 +993,8 @@ ssf: # One `#` where working but not using, two `# #` for not working at all # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - # - [amazonlinux , 2 , develop, 2, default] - # # - [arch-base , latest, develop, 2, default] + # - [amazonlinux , 2 , master, 2, default] + # # - [arch-base , latest, master, 2, default] - [ubuntu , 18.04, 2019.2, 3, default] - [fedora , 30 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] @@ -1022,7 +1022,7 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [ubuntu , 18.04, develop, 3, default] + - [ubuntu , 18.04, master, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [debian , 9 , 2018.3, 2, default] @@ -1610,7 +1610,7 @@ ssf: # currently failing on both `ubuntu-16.04` and `debian-8` # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [ubuntu , 18.04, develop, 3, default] + - [ubuntu , 18.04, master, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [debian , 9 , 2018.3, 2, default] @@ -1725,12 +1725,12 @@ ssf: platforms: # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] - - [ubuntu , 18.04, develop, 3] - - [centos , 7 , develop, 3] - - [fedora , 30 , develop, 3] - - [opensuse/leap, 15 , develop, 3] - - [amazonlinux , 2 , develop, 2] - - [arch-base , latest, develop, 2] + - [ubuntu , 18.04, master, 3] + - [centos , 7 , master, 3] + - [fedora , 30 , master, 3] + - [opensuse/leap, 15 , master, 3] + - [amazonlinux , 2 , master, 2] + - [arch-base , latest, master, 2] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 7 , 2019.2, 3] @@ -1860,7 +1860,7 @@ ssf: - .sls: 'test/salt/pillar/default.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [ubuntu , 18.04, develop, 3, default] + - [ubuntu , 18.04, master, 3, default] - [debian , 9 , 2019.2, 3, default] - [centos , 7 , 2019.2, 3, default] - [fedora , 29 , 2018.3, 2, default] @@ -1942,12 +1942,12 @@ ssf: # If values are set, only use these as commented entries in the matrix platforms_matrix_commented_includes: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [ubuntu , 18.04, develop, 3, ''] - - [centos , 7 , develop, 3, ''] - - [fedora , 30 , develop, 3, ''] - - [opensuse/leap, 15 , develop, 3, ''] - - [amazonlinux , 2 , develop, 2, ''] - - [arch-base , latest, develop, 2, ''] + - [ubuntu , 18.04, master, 3, ''] + - [centos , 7 , master, 3, ''] + - [fedora , 30 , master, 3, ''] + - [opensuse/leap, 15 , master, 3, ''] + - [amazonlinux , 2 , master, 2, ''] + - [arch-base , latest, master, 2, ''] - [debian , 9 , 2019.2, 3, ''] - [centos , 7 , 2019.2, 3, ''] - [opensuse/leap, 15 , 2019.2, 3, ''] From 5e88b441294fbb3ba8910a05b965b017d2f1d5fb Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 25 Oct 2019 01:21:00 +0100 Subject: [PATCH 02/19] revert(kitchen): "use bootstrapped `opensuse` images until `2019.2.2`" This reverts commit 25946b02dfd134473748ac3a75d4ae073b8ddd0c. --- ssf/files/default/kitchen.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml index 481a3666..694ee2f8 100644 --- a/ssf/files/default/kitchen.yml +++ b/ssf/files/default/kitchen.yml @@ -50,11 +50,7 @@ {%- macro format_driver_image(os, os_ver, salt_ver, py_ver) %} {%- filter indent(6) %} -{%- if os == 'opensuse/leap' %} -image: {{ os }}:{{ os_ver }} -{%- else %} image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') }}-{{ os_ver }} -{%- endif %} {%- endfilter %} {%- endmacro %} @@ -63,20 +59,10 @@ image: netmanagers/salt-{{ salt_ver }}-py{{ py_ver }}:{{ os | replace('/', '-') {#- Need to look at if this can be resolved from within the formulas themselves, though #} {%- filter indent(6) %} {%- set prov_cmds = [] %} -{#- Specific to unsalted `opensuse/leap` #} -{%- if os == 'opensuse/leap' %} -{%- do prov_cmds.append('# yamllint disable-line rule:line-length') %} -{%- do prov_cmds.append( - '- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python{0}-pip'.format(py_ver) - ) %} -{%- do prov_cmds.append('- systemctl enable sshd.service') %} -{%- endif %} {#- Specific to `master` #} {%- if salt_ver == 'master' %} -{%- if os != 'opensuse/leap' %} -{%- do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %} -{%- do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %} -{%- endif %} +{%- do prov_cmds.append('- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com') %} +{%- do prov_cmds.append('- sh bootstrap-salt.sh -XdPbfrq -x python{0} git {1}'.format(py_ver, salt_ver)) %} {%- if semrel_formula == 'deepsea' %} {%- if os in ['centos', 'fedora'] %} {%- do prov_cmds.append('- yum install make -y') %} @@ -173,9 +159,6 @@ platforms: {{- format_driver_prov_cmds(os, os_ver, salt_ver, py_ver) }} {{- format_driver_run_cmds(os, os_ver) }} {%- if [os, os_ver] == ['opensuse/leap', 15] %} - provisioner: - salt_bootstrap_options: -XdPfrq -x python{{ py_ver }} git {{ salt_ver }} - salt_install: bootstrap # Workaround to avoid intermittent failures on `opensuse-leap-15`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: From e5ee8aad8761b18ec017e82836e111bdcdcd0653 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 25 Oct 2019 03:12:26 +0100 Subject: [PATCH 03/19] refactor(kitchen): update `opensuse-leap` references from `15` => `15.1` --- ssf/files/default/kitchen.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml index 694ee2f8..967e983f 100644 --- a/ssf/files/default/kitchen.yml +++ b/ssf/files/default/kitchen.yml @@ -158,8 +158,8 @@ platforms: {{- format_driver_image(os, os_ver, salt_ver, py_ver) }} {{- format_driver_prov_cmds(os, os_ver, salt_ver, py_ver) }} {{- format_driver_run_cmds(os, os_ver) }} - {%- if [os, os_ver] == ['opensuse/leap', 15] %} - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + {%- if [os, os_ver] == ['opensuse/leap', 15.1] %} + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 From 88f33096dd19dbcb4766dbd56aaa716dc77b532d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 25 Oct 2019 17:59:26 +0100 Subject: [PATCH 04/19] test(salt-lint): check `.tst` files across all formulas --- ssf/files/default/.travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ssf/files/default/.travis.yml b/ssf/files/default/.travis.yml index c4d1e136..f5d11100 100644 --- a/ssf/files/default/.travis.yml +++ b/ssf/files/default/.travis.yml @@ -120,14 +120,9 @@ jobs: # [Py2/InsecurePlatformWarning] Tornado requires an up-to-date SSL module. - sudo apt-get install python3-pip python3-setuptools python3-wheel -y {%- endif %} - {#- Prepare variable used for file types to pipe to `salt-lint` #} - {%- set salt_lint_files = '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$' %} - {%- if use_saltcheck %} - {%- set salt_lint_files = salt_lint_files ~ '\|\.tst$' %} - {%- endif %} # Install and run `salt-lint` - {{ pip_cmd }} install --user salt-lint - - git ls-files | grep '{{ salt_lint_files }}' + - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' | xargs -I {} salt-lint {} # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting From 6221763beeb9554f71e11016a1c9ffbfa4ca3c6c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 25 Oct 2019 01:11:09 +0100 Subject: [PATCH 05/19] feat(defaults): upgrade platforms support after `2019.2.2` release * New release of pre-salted images --- ssf/defaults.yaml | 62 ++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index adf512ca..acfdeaa3 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -89,65 +89,49 @@ ssf_node_anchors: ### `master-py3` - [debian , 10 , master, 3] - # - [debian , 9 , master, 3] # unmaintained - [ubuntu , 18.04, master, 3] - - [centos , 7 , master, 3] - - [fedora , 30 , master, 3] - # - [fedora , 29 , master, 3] # unmaintained - - [opensuse/leap, 15 , master, 3] - + - [centos , 8 , master, 3] + - [fedora , 31 , master, 3] + - [opensuse/leap, 15.1 , master, 3] + - [amazonlinux , 2 , master, 3] ### ` master-py2` - - [amazonlinux , 2 , master, 2] - [arch-base , latest, master, 2] ### `2019.2-py3` - - [debian , 9 , 2019.2, 3] # unmaintained (resolve) + - [debian , 10 , 2019.2, 3] + - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - # - [ubuntu , 1804, 2019.2, 3] # unmaintained - - [centos , 7 , 2019.2, 3] - - [fedora , 30 , 2019.2, 3] - # - [fedora , 29 , 2019.2, 3] # unmaintained - - [opensuse/leap, 15 , 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] + - [amazonlinux , 2 , 2019.2, 3] ### `2019.2-py2` - # - [debian , 10 , 2019.2, 2] - # - [debian , 9 , 2019.2, 2] # unmaintained # - [ubuntu , 18.04, 2019.2, 2] - # - [centos , 7 , 2019.2, 2] - # - [fedora , 29 , 2019.2, 2] # unmaintained - # - [opensuse/leap, 15 , 2019.2, 2] # unmaintained - - [amazonlinux , 2 , 2019.2, 2] + - [centos , 7 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] ### `2018.3-py3` - # - [fedora , 29 , 2018.3, 3] - + - [fedora , 30 , 2018.3, 3] ### `2018.3-py2` # - [debian , 10 , 2018.3, 2] - [debian , 9 , 2018.3, 2] - # - [debian , 8 , 2018.3, 2] # unmaintained + # - [debian , 8 , 2018.3, 2] # - [ubuntu , 18.04, 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - # - [ubuntu , 1604 , 2018.3, 2] # unmaintained - [centos , 7 , 2018.3, 2] # - [centos , 6 , 2018.3, 2] - - [fedora , 29 , 2018.3, 2] # unmaintained (resolve) - # - [fedora , 28 , 2018.3, 2] # unmaintained - - [opensuse/leap, 15 , 2018.3, 2] - # - [opensuse/leap, 42 , 2018.3, 2] # unmaintained - # - [opensuse , 423 , 2018.3, 2] # unmaintained + - [opensuse/leap, 15.1 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] - [arch-base , latest, 2018.3, 2] ### `2017.7-py2` - # - [debian , 9 , 2017.7, 2] - - [debian , 8 , 2017.7, 2] # unmaintained (resolve) + - [debian , 8 , 2017.7, 2] - [ubuntu , 16.04, 2017.7, 2] - [centos , 6 , 2017.7, 2] - - [fedora , 29 , 2017.7, 2] - # - [fedora , 28 , 2017.7, 2] # unmaintained - - [opensuse/leap, 15 , 2017.7, 2] - # - [opensuse/leap, 42 , 2017.7, 2] # unmaintained + - [fedora , 30 , 2017.7, 2] + - [opensuse/leap, 15.1 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] - [arch-base , latest, 2017.7, 2] @@ -156,10 +140,10 @@ ssf_node_anchors: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] - - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2019.2, 3, default] + - [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] # To deal with excessive instances when mimicking `kitchen list -b` # If values are set, only use these as commented entries in the matrix From cad88887de6fa1078cf5f920eab624ae021149ef Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 25 Oct 2019 03:10:34 +0100 Subject: [PATCH 06/19] feat(formulas): upgrade platforms support after `2019.2.2` release * New release of pre-salted images --- ssf/formulas.yaml | 374 +++++++++++++++++++++++----------------------- 1 file changed, 190 insertions(+), 184 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 7e0c702d..1b5b9fcf 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -36,6 +36,7 @@ ssf_node_anchors: # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] - [ubuntu , 18.04, master, 3] + - [debian , 10 , 2019.2, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [debian , 9 , 2018.3, 2] @@ -44,27 +45,29 @@ ssf_node_anchors: - [ubuntu , 16.04, 2017.7, 2] platforms_osfamily_redhat: &platforms_osfamily_redhat # [os , os_ver, salt_ver, py_ver] - - [centos , 7 , master, 3] - - [fedora , 30 , master, 3] - - [amazonlinux , 2 , master, 2] - - [centos , 7 , 2019.2, 3] - - [fedora , 30 , 2019.2, 3] - - [amazonlinux , 2 , 2019.2, 2] + - [centos , 8 , master, 3] + - [fedora , 31 , master, 3] + - [amazonlinux , 2 , master, 3] + - [centos , 8 , 2019.2, 3] + - [fedora , 31 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 3] + - [centos , 7 , 2019.2, 2] + - [fedora , 30 , 2018.3, 3] - [centos , 7 , 2018.3, 2] - - [fedora , 29 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] - [centos , 6 , 2017.7, 2] - - [fedora , 29 , 2017.7, 2] + - [fedora , 30 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] platforms_osfamily_suse: &platforms_osfamily_suse # [os , os_ver, salt_ver, py_ver] - - [opensuse/leap, 15 , master, 3] - - [opensuse/leap, 15 , 2019.2, 3] - - [opensuse/leap, 15 , 2018.3, 2] - - [opensuse/leap, 15 , 2017.7, 2] + - [opensuse/leap, 15.1 , master, 3] + - [opensuse/leap, 15.1 , 2019.2, 3] + - [opensuse/leap, 15.1 , 2018.3, 2] + - [opensuse/leap, 15.1 , 2017.7, 2] platforms_os_debian: &platforms_os_debian # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] + - [debian , 10 , 2019.2, 3] - [debian , 9 , 2019.2, 3] - [debian , 9 , 2018.3, 2] - [debian , 8 , 2017.7, 2] @@ -84,20 +87,21 @@ ssf_node_anchors: # - [ubuntu , 16.04, 2017.7, 2] platforms_os_fedora: &platforms_os_fedora # [os , os_ver, salt_ver, py_ver] - - [fedora , 30 , master, 3] - - [fedora , 30 , 2019.2, 3] - - [fedora , 29 , 2018.3, 2] - - [fedora , 29 , 2017.7, 2] + - [fedora , 31 , master, 3] + - [fedora , 31 , 2019.2, 3] + - [fedora , 30 , 2018.3, 3] + - [fedora , 30 , 2017.7, 2] # platforms_os_suse: &platforms_os_suse # # [os , os_ver, salt_ver, py_ver] - # - [opensuse/leap, 15 , master, 3] - # - [opensuse/leap, 15 , 2019.2, 3] - # - [opensuse/leap, 15 , 2018.3, 2] - # - [opensuse/leap, 15 , 2017.7, 2] + # - [opensuse/leap, 15.1 , master, 3] + # - [opensuse/leap, 15.1 , 2019.2, 3] + # - [opensuse/leap, 15.1 , 2018.3, 2] + # - [opensuse/leap, 15.1 , 2017.7, 2] # platforms_os_centos: &platforms_os_centos # # [os , os_ver, salt_ver, py_ver] - # - [centos , 7 , master, 3] - # - [centos , 7 , 2019.2, 3] + # - [centos , 8 , master, 3] + # - [centos , 8 , 2019.2, 3] + # - [centos , 7 , 2019.2, 2] # - [centos , 7 , 2018.3, 2] # - [centos , 6 , 2017.7, 2] platforms_os_centos6: &platforms_os_centos6 @@ -105,15 +109,16 @@ ssf_node_anchors: - [centos , 6 , 2017.7, 2] # platforms_os_amazonlinux: &platforms_os_amazonlinux # # [os , os_ver, salt_ver, py_ver] - # - [amazonlinux , 2 , master, 2] - # - [amazonlinux , 2 , 2019.2, 2] + # - [amazonlinux , 2 , master, 3] + # - [amazonlinux , 2 , 2019.2, 3] # - [amazonlinux , 2 , 2018.3, 2] # - [amazonlinux , 2 , 2017.7, 2] platforms_os_centos_and_arch: &platforms_os_centos_and_arch # [os , os_ver, salt_ver, py_ver] - - [centos , 7 , master, 3] + - [centos , 8 , master, 3] - [arch-base , latest, master, 2] - - [centos , 7 , 2019.2, 3] + - [centos , 8 , 2019.2, 3] + - [centos , 7 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] - [centos , 7 , 2018.3, 2] - [arch-base , latest, 2018.3, 2] @@ -125,19 +130,17 @@ ssf_node_anchors: - [debian , 8 , 2017.7, 2] - [ubuntu , 16.04, 2017.7, 2] - [centos , 6 , 2017.7, 2] - - [fedora , 29 , 2017.7, 2] - # - [fedora , 28 , 2017.7, 2] - - [opensuse/leap, 15 , 2017.7, 2] - # - [opensuse/leap, 42 , 2017.7, 2] + - [fedora , 30 , 2017.7, 2] + - [opensuse/leap, 15.1 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] - [arch-base , latest, 2017.7, 2] platforms_matrix_osfamily_suites: &platforms_matrix_osfamily_suites # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 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] + - [amazonlinux , 2 , 2019.2, 3, redhat] + - [fedora , 30 , 2018.3, 3, redhat] + - [opensuse/leap, 15.1 , 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] @@ -151,21 +154,21 @@ ssf_node_anchors: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] - - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [centos , 8 , 2019.2, 3, default] + - [opensuse/leap, 15.1 , 2019.2, 3, default] + # - [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 , 2 , 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] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] - # - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2019.2, 3, default] + - [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] # yamllint disable-line rule:line-length travis_do_not_use_single_job_for_linters: &travis_do_not_use_single_job_for_linters @@ -251,10 +254,10 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] + - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - # - [opensuse/leap, 15 , 2018.3, 2, default] + - [fedora , 30 , 2018.3, 3, default] + # - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default apt: @@ -293,6 +296,7 @@ ssf: # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] - [ubuntu , 18.04, master, 3] + # - [debian , 10 , 2019.2, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] # - [debian , 9 , 2018.3, 2] @@ -305,7 +309,7 @@ ssf: # - [ubuntu , 18.04, master, 3, repositories] - [debian , 9 , 2019.2, 3, repositories] - [ubuntu , 18.04, 2019.2, 3, repositories] - - [debian , 9 , master, 3, preferences] + - [debian , 10 , master, 3, preferences] # - [ubuntu , 18.04, master, 3, preferences] - [debian , 9 , 2019.2, 3, preferences] - [ubuntu , 18.04, 2019.2, 3, preferences] @@ -420,11 +424,11 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + - [centos , 8 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [fedora , 30 , 2018.3, 3, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default cron: @@ -457,30 +461,32 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] # # - [debian , 10 , master, 3, default] - [ubuntu , 18.04, master, 3, default] - # - [centos , 7 , master, 3, default] - # - [fedora , 30 , master, 3, default] - # - [opensuse/leap, 15 , master, 3, default] - # # - [amazonlinux , 2 , master, 2, default] + # - [centos , 8 , master, 3, default] + # - [fedora , 31 , master, 3, default] + # - [opensuse/leap, 15.1 , master, 3, default] + # # - [amazonlinux , 2 , master, 3, default] # # - [arch-base , latest, master, 2, default] + - [debian , 10 , 2019.2, 3, default] # CHECK - [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] + # - [centos , 8 , 2019.2, 3, default] + - [fedora , 31 , 2019.2, 3, default] + # # - [opensuse/leap, 15.1 , 2019.2, 3, default] + # # - [amazonlinux , 2 , 2019.2, 3, default] + # - [centos , 7 , 2019.2, 2, default] # # - [arch-base , latest, 2019.2, 2, default] + # - [fedora , 30 , 2018.3, 3, 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] + - [opensuse/leap, 15.1 , 2018.3, 2, default] # # - [amazonlinux , 2 , 2018.3, 2, default] # # - [arch-base , latest, 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] + - [fedora , 30 , 2017.7, 2, default] + # - [opensuse/leap, 15.1 , 2017.7, 2, default] # # - [amazonlinux , 2 , 2017.7, 2, default] # # - [arch-base , latest, 2017.7, 2, default] use_tofs: true @@ -503,11 +509,11 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] + - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] + # - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] - # - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] travis: *travis_do_not_use_single_job_for_linters semrel_files: *semrel_files_default @@ -578,12 +584,12 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + # - [amazonlinux , 2 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] - - [fedora , 30 , 2019.2, 3, default] + - [fedora , 31 , 2019.2, 3, default] + # - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] - # - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default golang: @@ -600,11 +606,11 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] + - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] + - [fedora , 30 , 2018.3, 3, default] - [debian , 9 , 2018.3, 2, default] - - [fedora , 29 , 2018.3, 2, default] - # - [opensuse/leap, 15 , 2018.3, 2, default] + # - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] travis: *travis_do_not_use_single_job_for_linters use_tofs: true @@ -670,12 +676,12 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] + - [amazonlinux , 2 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] + - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] - - [opensuse/leap, 15 , 2017.7, 2, tables] + - [opensuse/leap, 15.1 , 2017.7, 2, tables] travis: *travis_do_not_use_single_job_for_linters yamllint: rules: @@ -747,10 +753,10 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [centos , 7 , master, 3, centarch] + - [centos , 8 , master, 3, centarch] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, centarch] - - [opensuse/leap, 15 , 2019.2, 3, default] + - [centos , 8 , 2019.2, 3, centarch] + - [opensuse/leap, 15.1 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, centarch] - [amazonlinux , 2 , 2018.3, 2, default] use_tofs: true @@ -855,10 +861,10 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, deb] - [ubuntu , 18.04, 2019.2, 3, git] - - [centos , 7 , 2019.2, 3, rpm] + - [centos , 8 , 2019.2, 3, rpm] - [arch-base , latest, 2019.2, 2, git] - - [fedora , 29 , 2018.3, 2, rpm] - - [opensuse/leap, 15 , 2018.3, 2, git] + - [fedora , 30 , 2018.3, 3, rpm] + - [opensuse/leap, 15.1 , 2018.3, 2, git] - [amazonlinux , 2 , 2017.7, 2, rpm] semrel_files: *semrel_files_default libvirt: @@ -902,13 +908,13 @@ ssf: - [debian , 10 , master, 3, default] - [debian , 10 , master, 3, clean] - [ubuntu , 18.04, 2019.2, 3, default] - - [fedora , 30 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + - [fedora , 31 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] + # - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] - # - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] - - [fedora , 29 , 2017.7, 2, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] + - [fedora , 30 , 2017.7, 2, default] # - [centos , 6 , 2017.7, 2, default] use_tofs: true semrel_files: *semrel_files_default @@ -940,11 +946,11 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + - [centos , 8 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, fedora] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [fedora , 30 , 2018.3, 3, fedora] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default logrotate: @@ -993,14 +999,14 @@ ssf: # One `#` where working but not using, two `# #` for not working at all # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - # - [amazonlinux , 2 , master, 2, default] + # - [amazonlinux , 2 , master, 3, default] # # - [arch-base , latest, master, 2, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [fedora , 30 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + - [fedora , 31 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 3, default] # # - [arch-base , latest, 2019.2, 2, default] - [centos , 7 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] # # - [arch-base , latest, 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] - [amazonlinux , 2 , 2017.7, 2, default] @@ -1049,11 +1055,11 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + - [centos , 8 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [fedora , 30 , 2018.3, 3, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] travis: *travis_do_not_use_single_job_for_linters use_tofs: true @@ -1098,11 +1104,11 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] + - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] + # - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] - # - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] travis: *travis_do_not_use_single_job_for_linters semrel_files: *semrel_files_default @@ -1178,9 +1184,9 @@ ssf: platforms_matrix: - [debian , 10 , master, 3, debian] - [ubuntu , 18.04, 2019.2, 3, ubuntu] - - [amazonlinux , 2 , 2019.2, 2, redhat] - - [fedora , 29 , 2018.3, 2, redhat] - - [opensuse/leap, 15 , 2018.3, 2, suse] + - [amazonlinux , 2 , 2019.2, 3, redhat] + - [fedora , 30 , 2018.3, 3, redhat] + - [opensuse/leap, 15.1 , 2018.3, 2, suse] - [centos , 6 , 2017.7, 2, redhat] travis: *travis_do_not_use_single_job_for_linters use_tofs: true @@ -1223,12 +1229,12 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [fedora , 30 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + - [centos , 8 , 2019.2, 3, default] + - [fedora , 31 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] - [ubuntu , 16.04, 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] use_tofs: true yamllint: @@ -1273,9 +1279,9 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [fedora , 30 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] + - [centos , 8 , 2019.2, 3, default] + - [fedora , 31 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 3, default] # - [arch-base , latest, 2019.2, 2, default] - [debian , 9 , 2018.3, 2, default] - [ubuntu , 16.04, 2018.3, 2, default] @@ -1325,9 +1331,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, debian] - [ubuntu , 18.04, 2019.2, 3, debian] - - [centos , 7 , 2019.2, 3, redhat] - - [fedora , 29 , 2018.3, 2, redhat] - - [opensuse/leap, 15 , 2018.3, 2, suse] + - [centos , 8 , 2019.2, 3, redhat] + - [fedora , 30 , 2018.3, 3, redhat] + - [opensuse/leap, 15.1 , 2018.3, 2, suse] - [centos , 6 , 2017.7, 2, redhat] travis: *travis_do_not_use_single_job_for_linters use_cirrus_ci: true @@ -1342,11 +1348,11 @@ ssf: 0: includes: # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , 2019.2, 3] + - [debian , 10 , 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] + - [centos , 8 , 2019.2, 3] + - [fedora , 31 , 2019.2, 3] + - [opensuse/leap, 15.1 , 2019.2, 3] inspec_yml: summary: >- Verify that Salt `v201902-py3` is setup and configured @@ -1365,8 +1371,8 @@ ssf: - [debian , 9 , 2019.2, 2] - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - - [opensuse/leap, 15 , 2019.2, 2] - - [amazonlinux , 2 , 2019.2, 2] + - [opensuse/leap, 15.1 , 2019.2, 2] + - [amazonlinux , 2 , 2019.2, 3] - [arch-base , latest, 2019.2, 2] inspec_yml: summary: >- @@ -1386,9 +1392,7 @@ ssf: - [debian , 9 , 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - [centos , 7 , 2018.3, 2] - # Would need a forced version, Fedora could be pinned to `minor`, though - # - [fedora , 29 , 2018.3, 2] - # - [opensuse/leap, 15 , 2018.3, 2] + # - [opensuse/leap, 15.1 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] - [arch-base , latest, 2018.3, 2] inspec_yml: @@ -1410,8 +1414,8 @@ ssf: - [ubuntu , 16.04, 2017.7, 2] - [centos , 6 , 2017.7, 2] # Would need a forced version, Fedora could be pinned to `minor`, though - # - [fedora , 29 , 2017.7, 2] - # - [opensuse/leap, 15 , 2017.7, 2] + # - [fedora , 30 , 2017.7, 2] + # - [opensuse/leap, 15.1 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] - [arch-base , latest, 2017.7, 2] inspec_yml: @@ -1437,55 +1441,54 @@ ssf: - [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] + # - [fedora , 30 , 2017.7, 2] + # - [opensuse/leap, 15.1 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] - [arch-base , latest, 2017.7, 2] - [debian , 9 , 2018.3, 2] - [ubuntu , 16.04, 2018.3, 2] - [centos , 7 , 2018.3, 2] - # - [fedora , 29 , 2018.3, 2] - # - [opensuse/leap, 15 , 2018.3, 2] + # - [opensuse/leap, 15.1 , 2018.3, 2] - [amazonlinux , 2 , 2018.3, 2] - [arch-base , latest, 2018.3, 2] + # - [fedora , 30 , 2018.3, 3] - [debian , 9 , 2019.2, 2] - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - - [opensuse/leap, 15 , 2019.2, 2] - - [amazonlinux , 2 , 2019.2, 2] + - [opensuse/leap, 15.1 , 2019.2, 2] + - [amazonlinux , 2 , 2019.2, 3] - [arch-base , latest, 2019.2, 2] - - [debian , 9 , 2019.2, 3] + - [debian , 10 , 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] + - [centos , 8 , 2019.2, 3] + - [fedora , 31 , 2019.2, 3] + - [opensuse/leap, 15.1 , 2019.2, 3] platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] # - [debian , 8 , 2017.7, 2, v201707-py2] - [ubuntu , 16.04, 2017.7, 2, v201707-py2] - [centos , 6 , 2017.7, 2, v201707-py2] - # # - [fedora , 29 , 2017.7, 2, v201707-py2] - # # - [opensuse/leap, 15 , 2017.7, 2, v201707-py2] + # # - [fedora , 30 , 2017.7, 2, v201707-py2] + # # - [opensuse/leap, 15.1 , 2017.7, 2, v201707-py2] # - [amazonlinux , 2 , 2017.7, 2, v201707-py2] # # - [arch-base , latest, 2017.7, 2, v201707-py2] # - [debian , 9 , 2018.3, 2, v201803-py2] # - [ubuntu , 16.04, 2018.3, 2, v201803-py2] - [centos , 7 , 2018.3, 2, v201803-py2] - # # - [fedora , 29 , 2018.3, 2, v201803-py2] - # # - [opensuse/leap, 15 , 2018.3, 2, v201803-py2] + # # - [opensuse/leap, 15.1 , 2018.3, 2, v201803-py2] - [amazonlinux , 2 , 2018.3, 2, v201803-py2] # # - [arch-base , latest, 2018.3, 2, v201803-py2] - [debian , 9 , 2019.2, 2, v201902-py2] - [ubuntu , 18.04, 2019.2, 2, v201902-py2] # - [centos , 7 , 2019.2, 2, v201902-py2] - # - [opensuse/leap, 15 , 2019.2, 2, v201902-py2] - # - [amazonlinux , 2 , 2019.2, 2, v201902-py2] + # - [opensuse/leap, 15.1 , 2019.2, 2, v201902-py2] + # - [amazonlinux , 2 , 2019.2, 3, v201902-py2] # # - [arch-base , latest, 2019.2, 2, v201902-py2] - # - [debian , 9 , 2019.2, 3, v201902-py3] + # - [debian , 10 , 2019.2, 3, v201902-py3] # - [ubuntu , 18.04, 2019.2, 3, v201902-py3] - # - [centos , 7 , 2019.2, 3, v201902-py3] - - [fedora , 30 , 2019.2, 3, v201902-py3] - - [opensuse/leap, 15 , 2019.2, 3, v201902-py3] + # - [centos , 8 , 2019.2, 3, v201902-py3] + - [fedora , 31 , 2019.2, 3, v201902-py3] + - [opensuse/leap, 15.1 , 2019.2, 3, v201902-py3] use_tofs: true yamllint: ignore: @@ -1659,10 +1662,10 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] + - [amazonlinux , 2 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [fedora , 30 , 2018.3, 3, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default syslog-ng: @@ -1726,30 +1729,31 @@ ssf: # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] - [ubuntu , 18.04, master, 3] - - [centos , 7 , master, 3] - - [fedora , 30 , master, 3] - - [opensuse/leap, 15 , master, 3] - - [amazonlinux , 2 , master, 2] + - [centos , 8 , master, 3] + - [fedora , 31 , master, 3] + - [opensuse/leap, 15.1 , master, 3] + - [amazonlinux , 2 , master, 3] - [arch-base , latest, master, 2] - [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] - - [amazonlinux , 2 , 2019.2, 2] + - [centos , 8 , 2019.2, 3] + - [fedora , 31 , 2019.2, 3] + - [opensuse/leap, 15.1 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 3] + - [centos , 7 , 2019.2, 2] # CHECK - [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] - - [fedora , 29 , 2018.3, 2] - - [opensuse/leap, 15 , 2018.3, 2] + - [opensuse/leap, 15.1 , 2018.3, 2] - [amazonlinux , 2 , 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 , 29 , 2017.7, 2] - - [opensuse/leap, 15 , 2017.7, 2] + - [fedora , 30 , 2017.7, 2] + - [opensuse/leap, 15.1 , 2017.7, 2] - [amazonlinux , 2 , 2017.7, 2] - [arch-base , latest, 2017.7, 2] platforms_matrix: *platforms_matrix_systemd_only @@ -1776,9 +1780,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [fedora , 30 , 2019.2, 3, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [centos , 8 , 2019.2, 3, default] + - [fedora , 31 , 2019.2, 3, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [ubuntu , 16.04, 2017.7, 2, default] use_tofs: true semrel_files: *semrel_files_default @@ -1820,10 +1824,10 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] + - [amazonlinux , 2 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [fedora , 30 , 2018.3, 3, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, centos6] rubocop: Cops: @@ -1861,10 +1865,10 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [ubuntu , 18.04, master, 3, default] - - [debian , 9 , 2019.2, 3, default] - - [centos , 7 , 2019.2, 3, default] - - [fedora , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, default] + - [debian , 10 , 2019.2, 3, default] # CHECK + - [centos , 8 , 2019.2, 3, default] + - [fedora , 30 , 2018.3, 3, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [arch-base , latest, 2018.3, 2, default] - [ubuntu , 16.04, 2017.7, 2, default] travis: @@ -1933,35 +1937,37 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, ''] - [ubuntu , 18.04, 2019.2, 3, prod_server] - - [fedora , 30 , 2019.2, 3, prod_server] - - [amazonlinux , 2 , 2019.2, 2, prod_server] + - [fedora , 31 , 2019.2, 3, prod_server] + - [amazonlinux , 2 , 2019.2, 3, prod_server] - [centos , 7 , 2018.3, 2, prod_server] - - [opensuse/leap, 15 , 2018.3, 2, prod_server] + - [opensuse/leap, 15.1 , 2018.3, 2, prod_server] - [arch-base , latest, 2017.7, 2, prod_server] # To deal with excessive instances when mimicking `kitchen list -b` # If values are set, only use these as commented entries in the matrix platforms_matrix_commented_includes: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [ubuntu , 18.04, master, 3, ''] - - [centos , 7 , master, 3, ''] - - [fedora , 30 , master, 3, ''] - - [opensuse/leap, 15 , master, 3, ''] - - [amazonlinux , 2 , master, 2, ''] + - [centos , 8 , master, 3, ''] + - [fedora , 31 , master, 3, ''] + - [opensuse/leap, 15.1 , master, 3, ''] + - [amazonlinux , 2 , master, 3, ''] - [arch-base , latest, master, 2, ''] + - [debian , 10 , 2019.2, 3, ''] # CHECK - [debian , 9 , 2019.2, 3, ''] - - [centos , 7 , 2019.2, 3, ''] - - [opensuse/leap, 15 , 2019.2, 3, ''] + - [centos , 8 , 2019.2, 3, ''] + - [opensuse/leap, 15.1 , 2019.2, 3, ''] + - [centos , 7 , 2019.2, 2, ''] # CHECK - [arch-base , latest, 2019.2, 2, ''] + - [fedora , 30 , 2018.3, 3, ''] - [debian , 9 , 2018.3, 2, ''] - [ubuntu , 16.04, 2018.3, 2, ''] - - [fedora , 29 , 2018.3, 2, ''] - [amazonlinux , 2 , 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 , 29 , 2017.7, 2, ''] - - [opensuse/leap, 15 , 2017.7, 2, ''] + - [fedora , 30 , 2017.7, 2, ''] + - [opensuse/leap, 15.1 , 2017.7, 2, ''] - [amazonlinux , 2 , 2017.7, 2, ''] travis: *travis_do_not_use_single_job_for_linters semrel_files: *semrel_files_default @@ -2020,9 +2026,9 @@ ssf: - [debian , 10 , master, 3, default] - [debian , 9 , 2019.2, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - # - [fedora , 30 , 2019.2, 3, default] + # - [fedora , 31 , 2019.2, 3, default] + - [fedora , 30 , 2018.3, 3, default] - [ubuntu , 16.04, 2018.3, 2, default] - - [fedora , 29 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] rubocop: Cops: From 9b1be95e5058e26673f0515afe7d445788f45921 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 28 Oct 2019 23:14:47 +0000 Subject: [PATCH 07/19] ci(amazon): use `py2` until `py3` images can be prepared (revert later) --- ssf/defaults.yaml | 6 ++--- ssf/formulas.yaml | 66 +++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index acfdeaa3..9afacedf 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -93,8 +93,8 @@ ssf_node_anchors: - [centos , 8 , master, 3] - [fedora , 31 , master, 3] - [opensuse/leap, 15.1 , master, 3] - - [amazonlinux , 2 , master, 3] ### ` master-py2` + - [amazonlinux , 2 , master, 2] - [arch-base , latest, master, 2] ### `2019.2-py3` @@ -106,10 +106,10 @@ ssf_node_anchors: # - [centos , 7 , 2019.2, 3] - [fedora , 31 , 2019.2, 3] - [opensuse/leap, 15.1 , 2019.2, 3] - - [amazonlinux , 2 , 2019.2, 3] ### `2019.2-py2` # - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] + - [amazonlinux , 2 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] ### `2018.3-py3` @@ -141,7 +141,7 @@ ssf_node_anchors: - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [opensuse/leap, 15.1 , 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [arch-base , latest, 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 1b5b9fcf..d336a9ef 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -47,10 +47,10 @@ ssf_node_anchors: # [os , os_ver, salt_ver, py_ver] - [centos , 8 , master, 3] - [fedora , 31 , master, 3] - - [amazonlinux , 2 , master, 3] + - [amazonlinux , 2 , master, 2] - [centos , 8 , 2019.2, 3] - [fedora , 31 , 2019.2, 3] - - [amazonlinux , 2 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 2] - [centos , 7 , 2019.2, 2] - [fedora , 30 , 2018.3, 3] - [centos , 7 , 2018.3, 2] @@ -109,8 +109,8 @@ ssf_node_anchors: - [centos , 6 , 2017.7, 2] # platforms_os_amazonlinux: &platforms_os_amazonlinux # # [os , os_ver, salt_ver, py_ver] - # - [amazonlinux , 2 , master, 3] - # - [amazonlinux , 2 , 2019.2, 3] + # - [amazonlinux , 2 , master, 2] + # - [amazonlinux , 2 , 2019.2, 2] # - [amazonlinux , 2 , 2018.3, 2] # - [amazonlinux , 2 , 2017.7, 2] platforms_os_centos_and_arch: &platforms_os_centos_and_arch @@ -138,7 +138,7 @@ ssf_node_anchors: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, debian] - [ubuntu , 18.04, 2019.2, 3, debian] - - [amazonlinux , 2 , 2019.2, 3, redhat] + - [amazonlinux , 2 , 2019.2, 2, redhat] - [fedora , 30 , 2018.3, 3, redhat] - [opensuse/leap, 15.1 , 2018.3, 2, suse] - [centos , 6 , 2017.7, 2, redhat] @@ -156,7 +156,7 @@ ssf_node_anchors: - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 8 , 2019.2, 3, default] - [opensuse/leap, 15.1 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [arch-base , latest, 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] @@ -166,7 +166,7 @@ ssf_node_anchors: - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [opensuse/leap, 15.1 , 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] # - [arch-base , latest, 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] @@ -254,7 +254,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] # - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -425,7 +425,7 @@ ssf: - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 8 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -464,7 +464,7 @@ ssf: # - [centos , 8 , master, 3, default] # - [fedora , 31 , master, 3, default] # - [opensuse/leap, 15.1 , master, 3, default] - # # - [amazonlinux , 2 , master, 3, default] + # # - [Amazonlinux , 2 , master, 2, default] # # - [arch-base , latest, master, 2, default] - [debian , 10 , 2019.2, 3, default] # CHECK - [debian , 9 , 2019.2, 3, default] @@ -472,7 +472,7 @@ ssf: # - [centos , 8 , 2019.2, 3, default] - [fedora , 31 , 2019.2, 3, default] # # - [opensuse/leap, 15.1 , 2019.2, 3, default] - # # - [amazonlinux , 2 , 2019.2, 3, default] + # # - [amazonlinux , 2 , 2019.2, 2, default] # - [centos , 7 , 2019.2, 2, default] # # - [arch-base , latest, 2019.2, 2, default] # - [fedora , 30 , 2018.3, 3, default] @@ -509,7 +509,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] # - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] @@ -584,7 +584,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] - [fedora , 31 , 2019.2, 3, default] # - [fedora , 30 , 2018.3, 3, default] @@ -606,7 +606,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [debian , 9 , 2018.3, 2, default] @@ -676,7 +676,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] @@ -909,7 +909,7 @@ ssf: - [debian , 10 , master, 3, clean] - [ubuntu , 18.04, 2019.2, 3, default] - [fedora , 31 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] # - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] @@ -947,7 +947,7 @@ ssf: - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 8 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, fedora] - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -999,11 +999,11 @@ ssf: # One `#` where working but not using, two `# #` for not working at all # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - # - [amazonlinux , 2 , master, 3, default] + # - [amazonlinux , 2 , master, 2, default] # # - [arch-base , latest, master, 2, default] - [ubuntu , 18.04, 2019.2, 3, default] - [fedora , 31 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] # # - [arch-base , latest, 2019.2, 2, default] - [centos , 7 , 2018.3, 2, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -1056,7 +1056,7 @@ ssf: - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - [centos , 8 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -1104,7 +1104,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] # - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] @@ -1184,7 +1184,7 @@ ssf: platforms_matrix: - [debian , 10 , master, 3, debian] - [ubuntu , 18.04, 2019.2, 3, ubuntu] - - [amazonlinux , 2 , 2019.2, 3, redhat] + - [amazonlinux , 2 , 2019.2, 2, redhat] - [fedora , 30 , 2018.3, 3, redhat] - [opensuse/leap, 15.1 , 2018.3, 2, suse] - [centos , 6 , 2017.7, 2, redhat] @@ -1231,7 +1231,7 @@ ssf: - [debian , 10 , master, 3, default] - [centos , 8 , 2019.2, 3, default] - [fedora , 31 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] - [ubuntu , 16.04, 2018.3, 2, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -1281,7 +1281,7 @@ ssf: - [debian , 10 , master, 3, default] - [centos , 8 , 2019.2, 3, default] - [fedora , 31 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 3, default] + # - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] - [debian , 9 , 2018.3, 2, default] - [ubuntu , 16.04, 2018.3, 2, default] @@ -1372,7 +1372,7 @@ ssf: - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - [opensuse/leap, 15.1 , 2019.2, 2] - - [amazonlinux , 2 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] inspec_yml: summary: >- @@ -1456,7 +1456,7 @@ ssf: - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - [opensuse/leap, 15.1 , 2019.2, 2] - - [amazonlinux , 2 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] - [debian , 10 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] @@ -1482,7 +1482,7 @@ ssf: - [ubuntu , 18.04, 2019.2, 2, v201902-py2] # - [centos , 7 , 2019.2, 2, v201902-py2] # - [opensuse/leap, 15.1 , 2019.2, 2, v201902-py2] - # - [amazonlinux , 2 , 2019.2, 3, v201902-py2] + # - [amazonlinux , 2 , 2019.2, 2, v201902-py2] # # - [arch-base , latest, 2019.2, 2, v201902-py2] # - [debian , 10 , 2019.2, 3, v201902-py3] # - [ubuntu , 18.04, 2019.2, 3, v201902-py3] @@ -1662,7 +1662,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -1732,14 +1732,14 @@ ssf: - [centos , 8 , master, 3] - [fedora , 31 , master, 3] - [opensuse/leap, 15.1 , master, 3] - - [amazonlinux , 2 , master, 3] + - [amazonlinux , 2 , master, 2] - [arch-base , latest, master, 2] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 8 , 2019.2, 3] - [fedora , 31 , 2019.2, 3] - [opensuse/leap, 15.1 , 2019.2, 3] - - [amazonlinux , 2 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 2] - [centos , 7 , 2019.2, 2] # CHECK - [arch-base , latest, 2019.2, 2] - [fedora , 30 , 2018.3, 3] @@ -1824,7 +1824,7 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 3, default] + - [amazonlinux , 2 , 2019.2, 2, default] - [arch-base , latest, 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] @@ -1938,7 +1938,7 @@ ssf: - [debian , 10 , master, 3, ''] - [ubuntu , 18.04, 2019.2, 3, prod_server] - [fedora , 31 , 2019.2, 3, prod_server] - - [amazonlinux , 2 , 2019.2, 3, prod_server] + - [amazonlinux , 2 , 2019.2, 2, prod_server] - [centos , 7 , 2018.3, 2, prod_server] - [opensuse/leap, 15.1 , 2018.3, 2, prod_server] - [arch-base , latest, 2017.7, 2, prod_server] @@ -1950,7 +1950,7 @@ ssf: - [centos , 8 , master, 3, ''] - [fedora , 31 , master, 3, ''] - [opensuse/leap, 15.1 , master, 3, ''] - - [amazonlinux , 2 , master, 3, ''] + - [amazonlinux , 2 , master, 2, ''] - [arch-base , latest, master, 2, ''] - [debian , 10 , 2019.2, 3, ''] # CHECK - [debian , 9 , 2019.2, 3, ''] From eb2a53af89f63eee23af7fd71005a082fe285052 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 29 Oct 2019 03:51:18 +0000 Subject: [PATCH 08/19] chore(defaults): prepare commit title and body to be used in formulas --- ssf/defaults.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 9afacedf..6cd62beb 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -22,8 +22,8 @@ ssf_node_anchors: # An alternative method could be to use: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length - title: 'feat(semantic-release): implement for this formula' - body: '* Automated using https://github.com/myii/ssf-formula/pull/85' + title: 'ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci]' + body: '* Automated using https://github.com/myii/ssf-formula/pull/86' # yamllint enable rule:line-length github: owner: 'saltstack-formulas' From 13d1d4bf3c3c36d1881bdfd22a7690a7cd993b4e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 29 Oct 2019 21:26:34 +0000 Subject: [PATCH 09/19] feat(salt): adjust platforms and matrix for `2019.2.2` --- ssf/formulas.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index d336a9ef..20583596 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1349,9 +1349,10 @@ ssf: includes: # [os , os_ver, salt_ver, py_ver] - [debian , 10 , 2019.2, 3] + - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 8 , 2019.2, 3] - - [fedora , 31 , 2019.2, 3] + # - [fedora , 31 , 2019.2, 3] - [opensuse/leap, 15.1 , 2019.2, 3] inspec_yml: summary: >- @@ -1368,10 +1369,8 @@ ssf: 1: includes: # [os , os_ver, salt_ver, py_ver] - - [debian , 9 , 2019.2, 2] - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - - [opensuse/leap, 15.1 , 2019.2, 2] - [amazonlinux , 2 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] inspec_yml: @@ -1452,13 +1451,12 @@ ssf: - [amazonlinux , 2 , 2018.3, 2] - [arch-base , latest, 2018.3, 2] # - [fedora , 30 , 2018.3, 3] - - [debian , 9 , 2019.2, 2] - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - - [opensuse/leap, 15.1 , 2019.2, 2] - [amazonlinux , 2 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] - [debian , 10 , 2019.2, 3] + - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [centos , 8 , 2019.2, 3] - [fedora , 31 , 2019.2, 3] @@ -1472,22 +1470,21 @@ ssf: # # - [opensuse/leap, 15.1 , 2017.7, 2, v201707-py2] # - [amazonlinux , 2 , 2017.7, 2, v201707-py2] # # - [arch-base , latest, 2017.7, 2, v201707-py2] - # - [debian , 9 , 2018.3, 2, v201803-py2] + - [debian , 9 , 2018.3, 2, v201803-py2] # - [ubuntu , 16.04, 2018.3, 2, v201803-py2] - [centos , 7 , 2018.3, 2, v201803-py2] # # - [opensuse/leap, 15.1 , 2018.3, 2, v201803-py2] - - [amazonlinux , 2 , 2018.3, 2, v201803-py2] + # - [amazonlinux , 2 , 2018.3, 2, v201803-py2] # # - [arch-base , latest, 2018.3, 2, v201803-py2] - - [debian , 9 , 2019.2, 2, v201902-py2] - [ubuntu , 18.04, 2019.2, 2, v201902-py2] # - [centos , 7 , 2019.2, 2, v201902-py2] - # - [opensuse/leap, 15.1 , 2019.2, 2, v201902-py2] - # - [amazonlinux , 2 , 2019.2, 2, v201902-py2] + - [amazonlinux , 2 , 2019.2, 2, v201902-py2] # # - [arch-base , latest, 2019.2, 2, v201902-py2] - # - [debian , 10 , 2019.2, 3, v201902-py3] + - [debian , 10 , 2019.2, 3, v201902-py3] + # - [debian , 9 , 2019.2, 3, v201902-py3] # - [ubuntu , 18.04, 2019.2, 3, v201902-py3] # - [centos , 8 , 2019.2, 3, v201902-py3] - - [fedora , 31 , 2019.2, 3, v201902-py3] + # # - [fedora , 31 , 2019.2, 3, v201902-py3] - [opensuse/leap, 15.1 , 2019.2, 3, v201902-py3] use_tofs: true yamllint: From a054c08d47c2e776a9974bbb7c785b8f2c7f573e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 12:36:27 +0000 Subject: [PATCH 10/19] feat(libvirt): adjust matrix for `2019.2.2` --- ssf/formulas.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 20583596..db06301a 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -908,12 +908,12 @@ ssf: - [debian , 10 , master, 3, default] - [debian , 10 , master, 3, clean] - [ubuntu , 18.04, 2019.2, 3, default] - - [fedora , 31 , 2019.2, 3, default] + # - [fedora , 31 , 2019.2, 3, default] + - [opensuse/leap, 15.1 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] - # - [fedora , 30 , 2018.3, 3, default] + - [fedora , 30 , 2018.3, 3, default] - [centos , 7 , 2018.3, 2, default] - - [opensuse/leap, 15.1 , 2018.3, 2, default] - [fedora , 30 , 2017.7, 2, default] # - [centos , 6 , 2017.7, 2, default] use_tofs: true From ad8cd88c00f43d15a32748b7768696a840741a43 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 12:36:45 +0000 Subject: [PATCH 11/19] feat(timezone): adjust matrix for `2019.2.2` --- ssf/formulas.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index db06301a..e0149cd1 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1845,6 +1845,15 @@ ssf: provisioner: pillars_from_files: - .sls: 'test/salt/pillar/timezone.sls' + platforms_matrix: + # [os , os_ver, salt_ver, py_ver, inspec_suite] + - [debian , 10 , master, 3, default] + - [ubuntu , 18.04, 2019.2, 3, default] + - [opensuse/leap, 15.1 , 2019.2, 3, default] + # # - [arch-base , latest, 2019.2, 2, default] + - [fedora , 30 , 2018.3, 3, default] + - [amazonlinux , 2 , 2018.3, 2, default] + - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default ufw: context: From 2862c17a158a6243fa6ce1b15b26e077d2219e9c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 30 Oct 2019 10:41:54 +0000 Subject: [PATCH 12/19] feat(sysctl): adjust matrix for `2019.2.2` --- ssf/formulas.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index e0149cd1..f2f09eaf 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1659,11 +1659,13 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [amazonlinux , 2 , 2019.2, 2, default] - - [arch-base , latest, 2019.2, 2, default] - - [fedora , 30 , 2018.3, 3, default] + - [centos , 8 , 2019.2, 3, default] + - [fedora , 31 , 2019.2, 3, default] + # - [fedora , 30 , 2018.3, 3, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] + - [amazonlinux , 2 , 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] + - [arch-base , latest, 2017.7, 2, default] semrel_files: *semrel_files_default syslog-ng: context: From d73690afaf01c05b4b45ff540a5164f2e92d01e7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 01:03:59 +0000 Subject: [PATCH 13/19] feat(locale): adjust suites, platforms and matrix for `2019.2.2` --- ssf/defaults.yaml | 2 +- ssf/formulas.yaml | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 6cd62beb..4087038a 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -328,7 +328,7 @@ ssf: <<: *isk_default 1: <<: *isk_suite_default - name: 'fedora' + name: 'redhat' logrotate: *formula_default lvm: *formula_default mysql: *formula_default diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index f2f09eaf..fc12696a 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -85,12 +85,12 @@ ssf_node_anchors: # # [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] - - [fedora , 31 , master, 3] - - [fedora , 31 , 2019.2, 3] - - [fedora , 30 , 2018.3, 3] - - [fedora , 30 , 2017.7, 2] + # platforms_os_fedora: &platforms_os_fedora + # # [os , os_ver, salt_ver, py_ver] + # - [fedora , 31 , master, 3] + # - [fedora , 31 , 2019.2, 3] + # - [fedora , 30 , 2018.3, 3] + # - [fedora , 30 , 2017.7, 2] # platforms_os_suse: &platforms_os_suse # # [os , os_ver, salt_ver, py_ver] # - [opensuse/leap, 15.1 , master, 3] @@ -113,6 +113,18 @@ ssf_node_anchors: # - [amazonlinux , 2 , 2019.2, 2] # - [amazonlinux , 2 , 2018.3, 2] # - [amazonlinux , 2 , 2017.7, 2] + platforms_os_redhat_locale_specific: &platforms_os_redhat_locale_specific + # [os , os_ver, salt_ver, py_ver] + - [centos , 8 , master, 3] + - [fedora , 31 , master, 3] + - [amazonlinux , 2 , master, 2] + - [centos , 8 , 2019.2, 3] + - [fedora , 31 , 2019.2, 3] + - [amazonlinux , 2 , 2019.2, 2] + - [fedora , 30 , 2018.3, 3] + - [amazonlinux , 2 , 2018.3, 2] + - [fedora , 30 , 2017.7, 2] + - [amazonlinux , 2 , 2017.7, 2] platforms_os_centos_and_arch: &platforms_os_centos_and_arch # [os , os_ver, salt_ver, py_ver] - [centos , 8 , master, 3] @@ -925,7 +937,7 @@ ssf: repo: 'locale-formula' inspec_suites_kitchen: 0: - excludes: *platforms_os_fedora + excludes: *platforms_os_redhat_locale_specific inspec_yml: summary: >- Verify that the locale formula is setup and configured correctly @@ -933,24 +945,23 @@ ssf: pillars_from_files: - .sls: 'test/salt/pillar/default.sls' 1: - includes: *platforms_os_fedora + includes: *platforms_os_redhat_locale_specific provisioner: pillars_from_files: - - .sls: 'test/salt/pillar/fedora.sls' + - .sls: 'test/salt/pillar/redhat.sls' verifier: test_suite: 'default' inspec_suites_matrix: - default - - fedora + - redhat platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 8 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] - - [arch-base , latest, 2019.2, 2, default] - - [fedora , 30 , 2018.3, 3, fedora] - - [opensuse/leap, 15.1 , 2018.3, 2, default] + - [fedora , 31 , 2019.2, 3, redhat] + - [opensuse/leap, 15.1 , 2019.2, 3, default] + - [amazonlinux , 2 , 2018.3, 2, redhat] + - [arch-base , latest, 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] semrel_files: *semrel_files_default logrotate: From b27c0aeda283c37a5247ba2a8a96188e60293007 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 11:07:01 +0000 Subject: [PATCH 14/19] feat(letsencrypt): adjust matrix for `2019.2.2` --- ssf/formulas.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index fc12696a..704f75c7 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -873,9 +873,9 @@ ssf: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, deb] - [ubuntu , 18.04, 2019.2, 3, git] - - [centos , 8 , 2019.2, 3, rpm] + - [centos , 8 , 2019.2, 3, git] - [arch-base , latest, 2019.2, 2, git] - - [fedora , 30 , 2018.3, 3, rpm] + - [fedora , 30 , 2018.3, 3, git] - [opensuse/leap, 15.1 , 2018.3, 2, git] - [amazonlinux , 2 , 2017.7, 2, rpm] semrel_files: *semrel_files_default From 5c1a3183c63137ff626975e112be6d98f742dba3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 12:03:44 +0000 Subject: [PATCH 15/19] feat(deepsea): disable failing platform in matrix for `2019.2.2` --- ssf/formulas.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 704f75c7..b99f1a5d 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -470,6 +470,8 @@ ssf: 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 + # Update: the lines the have been modified due to `2019.2.2` can no longer + # be guaranteed (i.e. working or not) # [os , os_ver, salt_ver, py_ver, inspec_suite] # # - [debian , 10 , master, 3, default] - [ubuntu , 18.04, master, 3, default] @@ -482,7 +484,7 @@ ssf: - [debian , 9 , 2019.2, 3, default] # - [ubuntu , 18.04, 2019.2, 3, default] # - [centos , 8 , 2019.2, 3, default] - - [fedora , 31 , 2019.2, 3, default] + # # - [fedora , 31 , 2019.2, 3, default] # # - [opensuse/leap, 15.1 , 2019.2, 3, default] # # - [amazonlinux , 2 , 2019.2, 2, default] # - [centos , 7 , 2019.2, 2, default] From bb483745040fc9d9491d55d107c93a3cdf53dd7e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 12:04:37 +0000 Subject: [PATCH 16/19] feat(iscsi): disable failing platforms in matrix for `2019.2.2` --- ssf/formulas.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index b99f1a5d..c8b12be6 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -767,9 +767,9 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [centos , 8 , master, 3, centarch] + # # - [centos , 8 , master, 3, centarch] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 8 , 2019.2, 3, centarch] + # # - [centos , 8 , 2019.2, 3, centarch] - [opensuse/leap, 15.1 , 2019.2, 3, default] - [arch-base , latest, 2019.2, 2, centarch] - [amazonlinux , 2 , 2018.3, 2, default] From 96f61dc2af0b21e2d3b7b22d915d8e0306f06608 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 12:06:09 +0000 Subject: [PATCH 17/19] feat(lvm): disable failing platforms in matrix for `2019.2.2` --- ssf/formulas.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index c8b12be6..1544aa8f 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1010,15 +1010,17 @@ ssf: # Everything else working, even if lines have been removed # Keeping hold of this "working out" for future reference # One `#` where working but not using, two `# #` for not working at all + # Update: the lines the have been modified due to `2019.2.2` can no longer + # be guaranteed (i.e. working or not) # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] # - [amazonlinux , 2 , master, 2, default] # # - [arch-base , latest, master, 2, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [fedora , 31 , 2019.2, 3, default] + # # - [fedora , 31 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] # # - [arch-base , latest, 2019.2, 2, default] - - [centos , 7 , 2018.3, 2, default] + # # - [centos , 7 , 2018.3, 2, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] # # - [arch-base , latest, 2018.3, 2, default] # - [centos , 6 , 2017.7, 2, default] From 8e03ecbe65dc4b79b2a7d71de3233bf464d1535c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 12:08:39 +0000 Subject: [PATCH 18/19] feat(systemd): disable failing platform in matrix for `2019.2.2` --- ssf/formulas.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 1544aa8f..4e0e75e8 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -163,10 +163,11 @@ ssf_node_anchors: - [debian , 9 , 2018.3, 2, default] - [ubuntu , 16.04, 2017.7, 2, default] platforms_matrix_systemd_only: &platforms_matrix_systemd_only + # TODO: Get `centos-8` working again and re-enable # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - [ubuntu , 18.04, 2019.2, 3, default] - - [centos , 8 , 2019.2, 3, default] + # # - [centos , 8 , 2019.2, 3, default] - [opensuse/leap, 15.1 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] - [fedora , 30 , 2018.3, 3, default] From 6e495ef00aadee99677bb7e044db24eeb32e67e0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 12:10:17 +0000 Subject: [PATCH 19/19] feat(ufw): disable failing platforms in matrix for `2019.2.2` --- ssf/formulas.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 4e0e75e8..f287e3ce 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1889,8 +1889,8 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [ubuntu , 18.04, master, 3, default] - - [debian , 10 , 2019.2, 3, default] # CHECK - - [centos , 8 , 2019.2, 3, default] + # # - [debian , 10 , 2019.2, 3, default] + # # - [centos , 8 , 2019.2, 3, default] - [fedora , 30 , 2018.3, 3, default] - [opensuse/leap, 15.1 , 2018.3, 2, default] - [arch-base , latest, 2018.3, 2, default]