From 7f19796517e920d0b1773b22724c68d5a8de681b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 1 May 2020 02:57:19 +0100 Subject: [PATCH] test: remove deprecated Salt/Python versions --- test/integration/v201803-py2/README.md | 50 ------------------- .../v201803-py2/controls/pkgs_spec.rb | 23 --------- .../v201803-py2/controls/service_spec.rb | 16 ------ test/integration/v201803-py2/inspec.yml | 18 ------- test/salt/pillar/v201803-py2.sls | 5 -- 5 files changed, 112 deletions(-) delete mode 100644 test/integration/v201803-py2/README.md delete mode 100644 test/integration/v201803-py2/controls/pkgs_spec.rb delete mode 100644 test/integration/v201803-py2/controls/service_spec.rb delete mode 100644 test/integration/v201803-py2/inspec.yml delete mode 100644 test/salt/pillar/v201803-py2.sls diff --git a/test/integration/v201803-py2/README.md b/test/integration/v201803-py2/README.md deleted file mode 100644 index 8311cae..0000000 --- a/test/integration/v201803-py2/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# InSpec Profile: `v201803-py2` - -This shows the implementation of the `v201803-py2` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). - -## Verify a profile - -InSpec ships with built-in features to verify a profile structure. - -```bash -$ inspec check v201803-py2 -Summary -------- -Location: v201803-py2 -Profile: profile -Controls: 4 -Timestamp: 2019-06-24T23:09:01+00:00 -Valid: true - -Errors ------- - -Warnings --------- -``` - -## Execute a profile - -To run all **supported** controls on a local machine use `inspec exec /path/to/profile`. - -```bash -$ inspec exec v201803-py2 -.. - -Finished in 0.0025 seconds (files took 0.12449 seconds to load) -8 examples, 0 failures -``` - -## Execute a specific control from a profile - -To run one control from the profile use `inspec exec /path/to/profile --controls name`. - -```bash -$ inspec exec v201803-py2 --controls package -. - -Finished in 0.0025 seconds (files took 0.12449 seconds to load) -1 examples, 0 failures -``` - -See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb). diff --git a/test/integration/v201803-py2/controls/pkgs_spec.rb b/test/integration/v201803-py2/controls/pkgs_spec.rb deleted file mode 100644 index 72f3d74..0000000 --- a/test/integration/v201803-py2/controls/pkgs_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -version = - case platform[:family] - when 'redhat' - '2018.3.5-1.el7' - when 'debian' - '2018.3.5+ds-1' - end - -control 'salt packages' do - title 'should be installed' - - %w[ - salt-master - salt-minion - ].each do |p| - describe package(p) do - it { should be_installed } - its('version') { should eq version } - end - end -end diff --git a/test/integration/v201803-py2/controls/service_spec.rb b/test/integration/v201803-py2/controls/service_spec.rb deleted file mode 100644 index 9d99883..0000000 --- a/test/integration/v201803-py2/controls/service_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -control 'salt services' do - title 'should be running' - - %w[ - salt-master - salt-minion - ].each do |p| - describe service(p) do - it { should be_installed } - it { should be_enabled } - it { should be_running } - end - end -end diff --git a/test/integration/v201803-py2/inspec.yml b/test/integration/v201803-py2/inspec.yml deleted file mode 100644 index 253f5fa..0000000 --- a/test/integration/v201803-py2/inspec.yml +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- -name: v201803-py2 -title: salt formula -maintainer: SaltStack Formulas -license: Apache-2.0 -summary: Verify that Salt `v201803-py2` is setup and configured -supports: - - platform-name: debian - - platform-name: ubuntu - - platform-name: centos - - platform-name: fedora - - platform-name: opensuse - - platform-name: suse - - platform-name: freebsd - - platform-name: amazon - - platform-name: arch diff --git a/test/salt/pillar/v201803-py2.sls b/test/salt/pillar/v201803-py2.sls deleted file mode 100644 index 523ab88..0000000 --- a/test/salt/pillar/v201803-py2.sls +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- -salt: - release: '2018.3'