Merge pull request #4601 from inspec/mj/tk

Re-organize test-kitchen files. Add BK Pipeline
2024-11-23 13:13:22 +00:00 · 2019-10-17 12:49:31 -07:00 · 2019-10-17 12:49:31 -07:00 · 245f681cb8
commit 245f681cb8
parent 0542ac5b30 227a97991d
86 changed files with 19 additions and 6 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@ -26,3 +26,4 @@ plugins:
    enabled: true
 exclude_patterns:
  - "www/source/javascripts/"
+  - "test/kitchen"
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@ -44,6 +44,9 @@ pipelines:
 - www/deploy:
    description: Deploy website to inspec.io
    definition: .expeditor/wwwdeploy.yml
+ - verify/resources:
+    description: Test core resources with test-kitchen.
+    definition: .expeditor/verify.resources.yml
 - integration/libraries:
    description: Integration with plugins, gems, resource packs.
    definition: .expeditor/integration.libraries.yml
@ -164,3 +167,7 @@ subscriptions:
         only_if_team_member:
           - inspec/owners
           - inspec/inspec-core-team
+     - post_github_comment:.expeditor/templates/pull_request.mustache
+ - workload: buildkite_build_passed:{{agent_id}}:verify:*
+   actions:
+    - trigger_pipeline:verify/resources
--- a/.expeditor/verify.resources.yml
+++ b/.expeditor/verify.resources.yml
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -1,5 +1,6 @@
 AllCops:
  Exclude:
+    - 'test/kitchen/**/*'
    - 'test/integration/**/controls/**/*.rb'
    - 'test/unit/mock/profiles/**/*.rb'
    - 'test/unit/mock/config_dirs/**/*.rb'
--- a/kitchen.chef.yml
+++ b/kitchen.chef.yml
@ -11,7 +11,7 @@ verifier:

 lifecycle:
  pre_converge:
-    - local: gem build inspec-core.gemspec --output test/cookbooks/os_prepare/files/inspec-core-local.gem
+    - local: gem build inspec-core.gemspec --output test/kitchen/cookbooks/os_prepare/files/inspec-core-local.gem

 platforms:
 # The following (private) boxes are shared via VagrantCloud and are only
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@ -11,7 +11,7 @@ verifier:

 lifecycle:
  pre_converge:
-    - local: gem build inspec-core.gemspec --output test/cookbooks/os_prepare/files/inspec-core-local.gem
+    - local: gem build inspec-core.gemspec --output test/kitchen/cookbooks/os_prepare/files/inspec-core-local.gem

 platforms:
  - name: centos-6
@ -35,6 +35,6 @@ suites:
      - recipe[os_prepare::find_files]
    verifier:
      inspec_tests:
-        - test/integration/find_files
+        - test/kitchen/policies/find_files
    excludes:
      - freebsd-11
--- a/kitchen.yml
+++ b/kitchen.yml
@ -9,7 +9,7 @@ transport:

 lifecycle:
  pre_converge:
-    - local: gem build inspec-core.gemspec --output test/cookbooks/os_prepare/files/inspec-core-local.gem
+    - local: gem build inspec-core.gemspec --output test/kitchen/cookbooks/os_prepare/files/inspec-core-local.gem

 provisioner:
  name: dokken
@ -100,13 +100,13 @@ platforms:
      - RUN /usr/bin/apt-get update -y

 suites:
- name: default
+- name: resources-core
  run_list:
  - recipe[os_prepare]
  - recipe[audit]
  verifier:
    inspec_tests:
-      - test/integration/default
+      - test/kitchen/policies/resources-core
  attributes:
    audit:
      attributes:
@ -122,3 +122,7 @@ suites:
    osprepare:
      docker: true
      application: false
+
+- name: resources-database
+- name: resources-unix
+- name: resources-windows
--- a/test/kitchen/cookbooks/os_prepare/attributes/default.rb
+++ b/test/kitchen/cookbooks/os_prepare/attributes/default.rb
--- a/test/kitchen/cookbooks/os_prepare/files/empty.iso
+++ b/test/kitchen/cookbooks/os_prepare/files/empty.iso
--- a/test/kitchen/cookbooks/os_prepare/files/example.csv
+++ b/test/kitchen/cookbooks/os_prepare/files/example.csv
--- a/test/kitchen/cookbooks/os_prepare/files/example.ini
+++ b/test/kitchen/cookbooks/os_prepare/files/example.ini
--- a/test/kitchen/cookbooks/os_prepare/files/example.json
+++ b/test/kitchen/cookbooks/os_prepare/files/example.json
--- a/test/kitchen/cookbooks/os_prepare/files/example.toml
+++ b/test/kitchen/cookbooks/os_prepare/files/example.toml
--- a/test/kitchen/cookbooks/os_prepare/files/example.xml
+++ b/test/kitchen/cookbooks/os_prepare/files/example.xml
--- a/test/kitchen/cookbooks/os_prepare/files/example.yml
+++ b/test/kitchen/cookbooks/os_prepare/files/example.yml
--- a/test/kitchen/cookbooks/os_prepare/files/httpd.conf
+++ b/test/kitchen/cookbooks/os_prepare/files/httpd.conf
--- a/test/kitchen/cookbooks/os_prepare/metadata.rb
+++ b/test/kitchen/cookbooks/os_prepare/metadata.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/_runit_service_centos.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/_runit_service_centos.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/_upstart_service_centos.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/_upstart_service_centos.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/apache.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/apache.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/apt.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/apt.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/auditctl.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/auditctl.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/default.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/default.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/dh_params.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/dh_params.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/docker_host.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/docker_host.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/file.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/file.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/find_files.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/find_files.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/iis.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/iis.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/iptables.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/iptables.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/json_yaml_csv_ini_xml.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/json_yaml_csv_ini_xml.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/mount.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/mount.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/os_env.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/os_env.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/package.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/package.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/postgres.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/postgres.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/registry_key.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/registry_key.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/service.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/service.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/ssh.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/ssh.rb
--- a/test/kitchen/cookbooks/os_prepare/recipes/x509.rb
+++ b/test/kitchen/cookbooks/os_prepare/recipes/x509.rb
--- a/test/kitchen/cookbooks/os_prepare/templates/sv-default-svlog-run.erb
+++ b/test/kitchen/cookbooks/os_prepare/templates/sv-default-svlog-run.erb
--- a/test/kitchen/policies/default/controls/_debug_spec.rb
+++ b/test/kitchen/policies/default/controls/_debug_spec.rb
--- a/test/kitchen/policies/default/controls/apache_conf_spec.rb
+++ b/test/kitchen/policies/default/controls/apache_conf_spec.rb
--- a/test/kitchen/policies/default/controls/apt_spec.rb
+++ b/test/kitchen/policies/default/controls/apt_spec.rb
--- a/test/kitchen/policies/default/controls/audit_spec.rb
+++ b/test/kitchen/policies/default/controls/audit_spec.rb
--- a/test/kitchen/policies/default/controls/cmp_matcher_spec.rb
+++ b/test/kitchen/policies/default/controls/cmp_matcher_spec.rb
--- a/test/kitchen/policies/default/controls/csv_spec.rb
+++ b/test/kitchen/policies/default/controls/csv_spec.rb
--- a/test/kitchen/policies/default/controls/dh_params_spec.rb
+++ b/test/kitchen/policies/default/controls/dh_params_spec.rb
--- a/test/kitchen/policies/default/controls/docker_spec.rb
+++ b/test/kitchen/policies/default/controls/docker_spec.rb
--- a/test/kitchen/policies/default/controls/etc_group_spec.rb
+++ b/test/kitchen/policies/default/controls/etc_group_spec.rb
--- a/test/kitchen/policies/default/controls/file_spec.rb
+++ b/test/kitchen/policies/default/controls/file_spec.rb
--- a/test/kitchen/policies/default/controls/filesystem.rb
+++ b/test/kitchen/policies/default/controls/filesystem.rb
--- a/test/kitchen/policies/default/controls/group_spec.rb
+++ b/test/kitchen/policies/default/controls/group_spec.rb
--- a/test/kitchen/policies/default/controls/iis_site_spec.rb
+++ b/test/kitchen/policies/default/controls/iis_site_spec.rb
--- a/test/kitchen/policies/default/controls/ini_spec.rb
+++ b/test/kitchen/policies/default/controls/ini_spec.rb
--- a/test/kitchen/policies/default/controls/ip6tables_spec.rb
+++ b/test/kitchen/policies/default/controls/ip6tables_spec.rb
--- a/test/kitchen/policies/default/controls/iptables_spec.rb
+++ b/test/kitchen/policies/default/controls/iptables_spec.rb
--- a/test/kitchen/policies/default/controls/json_spec.rb
+++ b/test/kitchen/policies/default/controls/json_spec.rb
--- a/test/kitchen/policies/default/controls/kernel_module_spec.rb
+++ b/test/kitchen/policies/default/controls/kernel_module_spec.rb
--- a/test/kitchen/policies/default/controls/kernel_parameter_spec.rb
+++ b/test/kitchen/policies/default/controls/kernel_parameter_spec.rb
--- a/test/kitchen/policies/default/controls/matcher_test.rb
+++ b/test/kitchen/policies/default/controls/matcher_test.rb
--- a/test/kitchen/policies/default/controls/mount_spec.rb
+++ b/test/kitchen/policies/default/controls/mount_spec.rb
--- a/test/kitchen/policies/default/controls/mssql_session_spec.rb
+++ b/test/kitchen/policies/default/controls/mssql_session_spec.rb
--- a/test/kitchen/policies/default/controls/os_env_spec.rb
+++ b/test/kitchen/policies/default/controls/os_env_spec.rb
--- a/test/kitchen/policies/default/controls/os_spec.rb
+++ b/test/kitchen/policies/default/controls/os_spec.rb
--- a/test/kitchen/policies/default/controls/package_spec.rb
+++ b/test/kitchen/policies/default/controls/package_spec.rb
--- a/test/kitchen/policies/default/controls/port_spec.rb
+++ b/test/kitchen/policies/default/controls/port_spec.rb
--- a/test/kitchen/policies/default/controls/postgres_session_spec.rb
+++ b/test/kitchen/policies/default/controls/postgres_session_spec.rb
--- a/test/kitchen/policies/default/controls/powershell_spec.rb
+++ b/test/kitchen/policies/default/controls/powershell_spec.rb
--- a/test/kitchen/policies/default/controls/registry_key_spec.rb
+++ b/test/kitchen/policies/default/controls/registry_key_spec.rb
--- a/test/kitchen/policies/default/controls/secpol_spec.rb
+++ b/test/kitchen/policies/default/controls/secpol_spec.rb
--- a/test/kitchen/policies/default/controls/security_identifier_spec.rb
+++ b/test/kitchen/policies/default/controls/security_identifier_spec.rb
--- a/test/kitchen/policies/default/controls/service_spec.rb
+++ b/test/kitchen/policies/default/controls/service_spec.rb
--- a/test/kitchen/policies/default/controls/toml_spec.rb
+++ b/test/kitchen/policies/default/controls/toml_spec.rb
--- a/test/kitchen/policies/default/controls/user_spec.rb
+++ b/test/kitchen/policies/default/controls/user_spec.rb
--- a/test/kitchen/policies/default/controls/vbscript_spec.rb
+++ b/test/kitchen/policies/default/controls/vbscript_spec.rb
--- a/test/kitchen/policies/default/controls/virtualization_spec.rb
+++ b/test/kitchen/policies/default/controls/virtualization_spec.rb
--- a/test/kitchen/policies/default/controls/windows_hotfix_spec.rb
+++ b/test/kitchen/policies/default/controls/windows_hotfix_spec.rb
--- a/test/kitchen/policies/default/controls/windows_task_spec.rb
+++ b/test/kitchen/policies/default/controls/windows_task_spec.rb
--- a/test/kitchen/policies/default/controls/wmi_spec.rb
+++ b/test/kitchen/policies/default/controls/wmi_spec.rb
--- a/test/kitchen/policies/default/controls/x509_spec.rb
+++ b/test/kitchen/policies/default/controls/x509_spec.rb
--- a/test/kitchen/policies/default/controls/xml_spec.rb
+++ b/test/kitchen/policies/default/controls/xml_spec.rb
--- a/test/kitchen/policies/default/controls/yaml_spec.rb
+++ b/test/kitchen/policies/default/controls/yaml_spec.rb
--- a/test/kitchen/policies/default/inspec.yml
+++ b/test/kitchen/policies/default/inspec.yml
--- a/test/kitchen/policies/find_files/README.md
+++ b/test/kitchen/policies/find_files/README.md
--- a/test/kitchen/policies/find_files/controls/find_files_spec.rb
+++ b/test/kitchen/policies/find_files/controls/find_files_spec.rb
--- a/test/kitchen/policies/find_files/inspec.yml
+++ b/test/kitchen/policies/find_files/inspec.yml
--- a/test/kitchen/policies/find_files/libraries/find_files.rb
+++ b/test/kitchen/policies/find_files/libraries/find_files.rb