From d5e619d4d69d82e087528bff956ccc316d07002a Mon Sep 17 00:00:00 2001 From: Josh Barker Date: Fri, 28 Sep 2018 11:46:23 +1000 Subject: [PATCH] Replace serverspec with InSpec profile for smoke_package_current Signed-off-by: Josh Barker --- .../controls/smoke_package_current.rb | 6 ++++++ test/integration/smoke_package_current/inspec.yml | 11 +++++++++++ .../serverspec/assert_authn_enabled_spec.rb | 1 - .../serverspec/assert_credentials_created_spec.rb | 1 - .../serverspec/assert_job_built_spec.rb | 1 - .../serverspec/assert_job_created_spec.rb | 1 - .../serverspec/assert_plugin_installed_spec.rb | 1 - .../serverspec/assert_script_executed_spec.rb | 1 - .../serverspec/assert_slave_jnlp_created_spec.rb | 1 - .../serverspec/assert_slave_ssh_created_spec.rb | 1 - .../serverspec/assert_user_created_spec.rb | 1 - 11 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 test/integration/smoke_package_current/controls/smoke_package_current.rb create mode 100644 test/integration/smoke_package_current/inspec.yml delete mode 120000 test/integration/smoke_package_current/serverspec/assert_authn_enabled_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_credentials_created_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_job_built_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_job_created_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_plugin_installed_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_script_executed_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_slave_jnlp_created_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_slave_ssh_created_spec.rb delete mode 120000 test/integration/smoke_package_current/serverspec/assert_user_created_spec.rb diff --git a/test/integration/smoke_package_current/controls/smoke_package_current.rb b/test/integration/smoke_package_current/controls/smoke_package_current.rb new file mode 100644 index 0000000000..b57dea3664 --- /dev/null +++ b/test/integration/smoke_package_current/controls/smoke_package_current.rb @@ -0,0 +1,6 @@ +# encoding: utf-8 +# copyright: 2018, The Authors + +title 'Test all the Jenkins things' + +include_controls 'jenkins_smoke' diff --git a/test/integration/smoke_package_current/inspec.yml b/test/integration/smoke_package_current/inspec.yml new file mode 100644 index 0000000000..2ac4f28045 --- /dev/null +++ b/test/integration/smoke_package_current/inspec.yml @@ -0,0 +1,11 @@ +name: smoke_package_current +title: InSpec Profile +maintainer: The Authors +copyright: The Authors +copyright_email: you@example.com +license: Apache-2.0 +summary: An InSpec Compliance Profile +version: 0.1.0 +depends: + - name: jenkins_smoke + path: test/integration/jenkins_smoke diff --git a/test/integration/smoke_package_current/serverspec/assert_authn_enabled_spec.rb b/test/integration/smoke_package_current/serverspec/assert_authn_enabled_spec.rb deleted file mode 120000 index 58c51868ba..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_authn_enabled_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../authentication_private_key/serverspec/assert_authn_enabled_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_credentials_created_spec.rb b/test/integration/smoke_package_current/serverspec/assert_credentials_created_spec.rb deleted file mode 120000 index c91e04382b..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_credentials_created_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_credentials_create/serverspec/assert_created_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_job_built_spec.rb b/test/integration/smoke_package_current/serverspec/assert_job_built_spec.rb deleted file mode 120000 index cb99ca53eb..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_job_built_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_job_build/serverspec/assert_built_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_job_created_spec.rb b/test/integration/smoke_package_current/serverspec/assert_job_created_spec.rb deleted file mode 120000 index 6c6f27c36e..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_job_created_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_job_create/serverspec/assert_created_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_plugin_installed_spec.rb b/test/integration/smoke_package_current/serverspec/assert_plugin_installed_spec.rb deleted file mode 120000 index d826329f28..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_plugin_installed_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_plugin_install/serverspec/assert_installed_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_script_executed_spec.rb b/test/integration/smoke_package_current/serverspec/assert_script_executed_spec.rb deleted file mode 120000 index a41940c4f0..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_script_executed_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_script/serverspec/assert_executed_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_slave_jnlp_created_spec.rb b/test/integration/smoke_package_current/serverspec/assert_slave_jnlp_created_spec.rb deleted file mode 120000 index e9ecfe1d30..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_slave_jnlp_created_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_slave_create/serverspec/assert_jnlp_created_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_slave_ssh_created_spec.rb b/test/integration/smoke_package_current/serverspec/assert_slave_ssh_created_spec.rb deleted file mode 120000 index 426db56cf4..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_slave_ssh_created_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_slave_create/serverspec/assert_ssh_created_spec.rb \ No newline at end of file diff --git a/test/integration/smoke_package_current/serverspec/assert_user_created_spec.rb b/test/integration/smoke_package_current/serverspec/assert_user_created_spec.rb deleted file mode 120000 index 65a5552ec8..0000000000 --- a/test/integration/smoke_package_current/serverspec/assert_user_created_spec.rb +++ /dev/null @@ -1 +0,0 @@ -../../jenkins_user_create/serverspec/assert_created_spec.rb \ No newline at end of file