update filter for opensuse and fix deps

Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>

5 files changed, 11 insertions, 4 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 69b65ad155..f6857f7ef4 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -89,6 +89,8 @@ steps:
 - label: "Integration Specs openSUSE :ruby: 2.6"
   commands:
     - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - zypper install -y cron
+    - zypper install -y insserv-compat
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
     - bundle exec rake spec:integration
   expeditor:
@@ -101,6 +103,8 @@ steps:
   commands:
     - /workdir/scripts/bk_tests/bk_container_prep.sh
     - zypper install -y cronie
+    - zypper install -y cron
+    - zypper install -y insserv-compat
     - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
     - bundle exec rake spec:functional
   expeditor:
@@ -112,6 +116,8 @@ steps:
 - label: "Unit Specs openSUSE :ruby: 2.6"
   commands:
     - /workdir/scripts/bk_tests/bk_container_prep.sh
+    - zypper install -y cron
+    - zypper install -y insserv-compat
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 8a8e749b84..b13b31125e 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -151,6 +151,7 @@ platforms:
     intermediate_instructions:
       - RUN /usr/bin/zypper --non-interactive update
       - RUN /usr/bin/zypper --non-interactive install cron
+      - RUN /usr/bin/zypper --non-interactive install insserv-compat
 
 suites:
   - name: end-to-end
diff --git a/spec/functional/resource/insserv_spec.rb b/spec/functional/resource/insserv_spec.rb
index 94b090af6a..1af33b434b 100644
--- a/spec/functional/resource/insserv_spec.rb
+++ b/spec/functional/resource/insserv_spec.rb
@@ -22,7 +22,7 @@ require "functional/resource/base"
 require "chef/mixin/shell_out"
 require "fileutils"
 
-describe Chef::Resource::Service, :requires_root, :opensuse15 do
+describe Chef::Resource::Service, :requires_root, :opensuse do
 
   include Chef::Mixin::ShellOut
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a7a583546e..c6fd27d271 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -169,7 +169,7 @@ RSpec.configure do |config|
   config.filter_run_excluding linux_only: true unless linux?
   config.filter_run_excluding aix_only: true unless aix?
   config.filter_run_excluding suse_only: true unless suse?
-  config.filter_run_excluding opensuse15: true unless opensuse15?
+  config.filter_run_excluding opensuse: true unless opensuse?
   config.filter_run_excluding debian_family_only: true unless debian_family?
   config.filter_run_excluding supports_cloexec: true unless supports_cloexec?
   config.filter_run_excluding selinux_only: true unless selinux_enabled?
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index e761b625d8..cc761ec581 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -174,8 +174,8 @@ def rhel6?
   rhel? && !!(ohai[:platform_version].to_i == 6)
 end
 
-def opensuse15?
-  suse? && !!(ohai[:platform_version].to_i == 15)
+def opensuse?
+  suse? && !!(ohai[:platform_version].to_i >= 15)
 end
 
 def rhel7?