diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 6be7b88b..4087038a 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' @@ -87,67 +87,51 @@ 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] - - ### `develop-py2` - - [amazonlinux , 2 , develop, 2] - - [arch-base , latest, develop, 2] + - [ubuntu , 18.04, master, 3] + - [centos , 8 , master, 3] + - [fedora , 31 , master, 3] + - [opensuse/leap, 15.1 , 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] ### `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 + - [centos , 7 , 2019.2, 2] - [amazonlinux , 2 , 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] + - [opensuse/leap, 15.1 , 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] + - [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 @@ -344,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/files/default/.travis.yml b/ssf/files/default/.travis.yml index 7c6f4dbd..f5d11100 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 @@ -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 diff --git a/ssf/files/default/kitchen.yml b/ssf/files/default/kitchen.yml index 8041518d..967e983f 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 `develop` (and the introduction of `master`) #} -{%- if salt_ver in ['develop', '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 %} +{#- Specific to `master` #} +{%- if salt_ver == 'master' %} +{%- 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') %} @@ -148,12 +134,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 %} @@ -176,11 +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] %} - provisioner: - salt_bootstrap_options: -XdPfrq -x python{{ py_ver }} git {{ salt_ver }} - salt_install: bootstrap - # 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 diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 0d993062..f287e3ce 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -35,7 +35,8 @@ 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 , 10 , 2019.2, 3] - [debian , 9 , 2019.2, 3] - [ubuntu , 18.04, 2019.2, 3] - [debian , 9 , 2018.3, 2] @@ -44,60 +45,63 @@ 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 , 2019.2, 3] - - [fedora , 30 , 2019.2, 3] + - [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] + - [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 , develop, 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] 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] # - [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 , 30 , develop, 3] - - [fedora , 30 , 2019.2, 3] - - [fedora , 29 , 2018.3, 2] - - [fedora , 29 , 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 , develop, 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 , develop, 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,28 @@ 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_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 , 7 , develop, 3] - - [arch-base , latest, develop, 2] - - [centos , 7 , 2019.2, 3] + - [centos , 8 , master, 3] + - [arch-base , latest, master, 2] + - [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,10 +142,8 @@ 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 @@ -136,36 +151,37 @@ ssf_node_anchors: - [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] + - [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] - [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] - [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 , 7 , 2019.2, 3, default] + # # - [centos , 8 , 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 , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, 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] + - [opensuse/leap, 15.1 , 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] + - [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 @@ -253,8 +269,8 @@ ssf: - [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] + - [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: @@ -292,7 +308,8 @@ ssf: platforms: # [os , os_ver, salt_ver, py_ver] - [debian , 10 , master, 3] - - [ubuntu , 18.04, develop, 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] @@ -302,11 +319,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 , 10 , master, 3, preferences] + # - [ubuntu , 18.04, master, 3, preferences] - [debian , 9 , 2019.2, 3, preferences] - [ubuntu , 18.04, 2019.2, 3, preferences] rubocop: @@ -420,11 +437,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] + - [centos , 8 , 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] + - [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: @@ -454,33 +471,37 @@ 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, 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 , 8 , master, 3, default] + # - [fedora , 31 , master, 3, default] + # - [opensuse/leap, 15.1 , 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] # - [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] + # - [centos , 8 , 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] # # - [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 @@ -505,9 +526,9 @@ ssf: - [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 , 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 @@ -580,10 +601,10 @@ ssf: - [ubuntu , 18.04, 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, 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: @@ -602,9 +623,9 @@ ssf: - [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] - [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 @@ -672,10 +693,10 @@ ssf: - [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] + - [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 +768,10 @@ ssf: platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - [debian , 10 , master, 3, default] - - [centos , 7 , develop, 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 +876,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, git] - [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, git] + - [opensuse/leap, 15.1 , 2018.3, 2, git] - [amazonlinux , 2 , 2017.7, 2, rpm] semrel_files: *semrel_files_default libvirt: @@ -902,13 +923,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] + # - [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] - [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] + - [fedora , 30 , 2017.7, 2, default] # - [centos , 6 , 2017.7, 2, default] use_tofs: true semrel_files: *semrel_files_default @@ -919,7 +940,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 @@ -927,24 +948,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 , 7 , 2019.2, 3, default] - # - [amazonlinux , 2 , 2019.2, 2, default] - - [arch-base , latest, 2019.2, 2, default] - - [fedora , 29 , 2018.3, 2, fedora] - - [opensuse/leap, 15 , 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: @@ -991,16 +1011,18 @@ 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 , 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] + # # - [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] - - [opensuse/leap, 15 , 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] - [amazonlinux , 2 , 2017.7, 2, default] @@ -1022,7 +1044,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] @@ -1049,11 +1071,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] + - [centos , 8 , 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] + - [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 @@ -1100,9 +1122,9 @@ ssf: - [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 , 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 @@ -1179,8 +1201,8 @@ ssf: - [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] + - [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 +1245,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] + - [centos , 8 , 2019.2, 3, default] + - [fedora , 31 , 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 , 2018.3, 2, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, default] use_tofs: true yamllint: @@ -1273,8 +1295,8 @@ 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] + - [centos , 8 , 2019.2, 3, default] + - [fedora , 31 , 2019.2, 3, default] # - [amazonlinux , 2 , 2019.2, 2, default] # - [arch-base , latest, 2019.2, 2, default] - [debian , 9 , 2018.3, 2, default] @@ -1325,9 +1347,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 +1364,12 @@ ssf: 0: 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 , 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 @@ -1362,10 +1385,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 , 2019.2, 2] - [amazonlinux , 2 , 2019.2, 2] - [arch-base , latest, 2019.2, 2] inspec_yml: @@ -1386,9 +1407,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 +1429,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 +1456,52 @@ 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] - - [debian , 9 , 2019.2, 2] + # - [fedora , 30 , 2018.3, 3] - [ubuntu , 18.04, 2019.2, 2] - [centos , 7 , 2019.2, 2] - - [opensuse/leap, 15 , 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 , 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] + - [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] - - [amazonlinux , 2 , 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] + - [amazonlinux , 2 , 2019.2, 2, v201902-py2] # # - [arch-base , latest, 2019.2, 2, v201902-py2] + - [debian , 10 , 2019.2, 3, v201902-py3] # - [debian , 9 , 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: @@ -1610,7 +1626,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] @@ -1659,11 +1675,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 , 29 , 2018.3, 2, default] - - [opensuse/leap, 15 , 2018.3, 2, 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: @@ -1725,31 +1743,32 @@ 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 , 8 , master, 3] + - [fedora , 31 , master, 3] + - [opensuse/leap, 15.1 , 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] - - [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] - [amazonlinux , 2 , 2019.2, 2] + - [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 +1795,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 @@ -1822,8 +1841,8 @@ ssf: - [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] + - [fedora , 30 , 2018.3, 3, default] + - [opensuse/leap, 15.1 , 2018.3, 2, default] - [centos , 6 , 2017.7, 2, centos6] rubocop: Cops: @@ -1844,6 +1863,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: @@ -1860,11 +1888,11 @@ ssf: - .sls: 'test/salt/pillar/default.sls' platforms_matrix: # [os , os_ver, salt_ver, py_ver, inspec_suite] - - [ubuntu , 18.04, develop, 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] + - [ubuntu , 18.04, master, 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] - [ubuntu , 16.04, 2017.7, 2, default] travis: @@ -1933,35 +1961,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] + - [fedora , 31 , 2019.2, 3, prod_server] - [amazonlinux , 2 , 2019.2, 2, 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, 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 , 8 , master, 3, ''] + - [fedora , 31 , master, 3, ''] + - [opensuse/leap, 15.1 , master, 3, ''] + - [amazonlinux , 2 , master, 2, ''] + - [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 +2050,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: