diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index e10e038f..455ed808 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -63,7 +63,7 @@ ssf_node_anchors: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length rule:quoted-strings title: "ci: enable Vagrant-based testing using GitHub Actions" - body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/307' + body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/308' # yamllint enable rule:line-length rule:quoted-strings github: owner: 'saltstack-formulas' diff --git a/ssf/files/default/Gemfile b/ssf/files/default/Gemfile index bdedacd4..79f53c85 100644 --- a/ssf/files/default/Gemfile +++ b/ssf/files/default/Gemfile @@ -14,6 +14,7 @@ gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' {%- if semrel_formula in [ 'golang', + 'nginx', 'openssh', 'openvpn', 'packages', diff --git a/ssf/files/tofs_nginx-formula/Gemfile.lock b/ssf/files/tofs_nginx-formula/Gemfile.lock new file mode 120000 index 00000000..c18ae2d6 --- /dev/null +++ b/ssf/files/tofs_nginx-formula/Gemfile.lock @@ -0,0 +1 @@ +../tofs_openssh-formula/Gemfile.lock \ No newline at end of file diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 7ce4abde..10d36aaf 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -2978,11 +2978,11 @@ ssf: # Check https://pkgs.org/search/?q=passenger includes: # [os , os_ver, salt_ver, py_ver] - - [debian , 0 , master, 0] - - [ubuntu , 20.04, master, 0] - - [ubuntu , 18.04, master, 0] - - [centos , 0 , master, 0] - - [oraclelinux , 8 , master, 0] + - [debian , 0 , 0 , 0] + - [ubuntu , 20.04, 0 , 0] + - [ubuntu , 18.04, 0 , 0] + - [centos , 0 , 0 , 0] + - [oraclelinux , 8 , 0 , 0] inspec_yml: summary: >- Verify that the nginx formula is setup and configured correctly @@ -3018,7 +3018,9 @@ ssf: - [oraclelinux , 7 , master, 0, default] - [gentoo/stage3, systemd, master, 0, default] - [arch-base , 0 , 3002.5, 0, default] - travis: *travis_do_not_use_single_job_for_linters + - [freebsd , 0 , latest, 3, default] + testing_freebsd: + active: true use_tofs: true yamllint: ignore: