summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordheerajd-msys <dheeraj.dubey@msystechnologies.com>2020-01-30 17:09:26 +0530
committerdheerajd-msys <dheeraj.dubey@msystechnologies.com>2020-04-13 15:50:27 +0530
commit1cd722bb20f81aa6b87fd7c30b3fbdb133a0d357 (patch)
tree00216b9872bc0990d60a946d73cab0143ed3abeb
parent584ae47eb49294510a3a2151ef2f2cbd5aff542a (diff)
downloadchef-1cd722bb20f81aa6b87fd7c30b3fbdb133a0d357.tar.gz
remove support for SLES11
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
-rw-r--r--lib/chef/resource/sysctl.rb1
-rw-r--r--omnibus/omnibus-test.sh2
-rw-r--r--spec/functional/resource/insserv_spec.rb206
-rw-r--r--spec/spec_helper.rb1
-rw-r--r--spec/support/platform_helpers.rb4
5 files changed, 1 insertions, 213 deletions
diff --git a/lib/chef/resource/sysctl.rb b/lib/chef/resource/sysctl.rb
index 240f45e60f..82dbe61081 100644
--- a/lib/chef/resource/sysctl.rb
+++ b/lib/chef/resource/sysctl.rb
@@ -57,7 +57,6 @@ class Chef
def after_created
raise "The sysctl resource requires Linux as it needs sysctl and the sysctl.d directory functionality." unless node["os"] == "linux"
- raise "The sysctl resource does not support SLES releases less than 12 as it requires a sysctl.d directory" if platform_family?("suse") && node["platform_version"].to_i < 12
end
def coerce_value(v)
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
index 0499d03b0b..2a3b6e520e 100644
--- a/omnibus/omnibus-test.sh
+++ b/omnibus/omnibus-test.sh
@@ -131,7 +131,7 @@ FORCE_FFI_YAJL=ext
export FORCE_FFI_YAJL
# chef-shell smoke tests require "rb-readline" which requires "infocmp"
-# most platforms provide "infocmp" by default via an "ncurses" package but SLES 11 and 12 provide it via "ncurses-devel" which
+# most platforms provide "infocmp" by default via an "ncurses" package but SLES 12 provide it via "ncurses-devel" which
# isn't typically installed. omnibus-toolchain has "infocmp" built-in so we add omnibus-toolchain to the PATH to ensure
# tests will function properly.
PATH="/opt/$TOOLCHAIN/bin:/usr/local/bin:/opt/$TOOLCHAIN/embedded/bin:$PATH"
diff --git a/spec/functional/resource/insserv_spec.rb b/spec/functional/resource/insserv_spec.rb
deleted file mode 100644
index 55a803d431..0000000000
--- a/spec/functional/resource/insserv_spec.rb
+++ /dev/null
@@ -1,206 +0,0 @@
-# encoding: UTF-8
-#
-# Author:: Dheeraj Dubey (<dheeraj.dubey@msystechnologies.com>)
-# Copyright:: Copyright 2009-2019, Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "functional/resource/base"
-require "chef/mixin/shell_out"
-require "fileutils"
-
-describe Chef::Resource::Service, :requires_root, :sles11 do
-
- include Chef::Mixin::ShellOut
-
- def service_should_be_enabled
- expect(shell_out!("/sbin/insserv -r -f #{new_resource.service_name}").exitstatus).to eq(0)
- expect(shell_out!("/sbin/insserv -d -f #{new_resource.service_name}").exitstatus).to eq(0)
- !Dir.glob("/etc/rc*/**/S*#{service_name}").empty?
- end
-
- def service_should_be_disabled
- expect(shell_out!("/sbin/insserv -r -f #{new_resource.service_name}").exitstatus).to eq(0)
- Dir.glob("/etc/rc*/**/S*#{service_name}").empty?
- end
-
- # Platform specific validation routines.
- def service_should_be_started(file_name)
- # The existence of this file indicates that the service was started.
- expect(File.exists?("#{Dir.tmpdir}/#{file_name}")).to be_truthy
- end
-
- def service_should_be_stopped(file_name)
- expect(File.exists?("#{Dir.tmpdir}/#{file_name}")).to be_falsey
- end
-
- def delete_test_files
- files = Dir.glob("#{Dir.tmpdir}/init[a-z_]*.txt")
- File.delete(*files)
- end
-
- # Actual tests
- let(:new_resource) do
- new_resource = Chef::Resource::Service.new("inittest", run_context)
- new_resource.provider Chef::Provider::Service::Insserv
- new_resource.supports({ status: true, restart: true, reload: true })
- new_resource
- end
-
- let(:provider) do
- provider = new_resource.provider_for_action(new_resource.action)
- provider
- end
-
- let (:service_name) { "Chef::Util::PathHelper.escape_glob_dir(current_resource.service_name)" }
-
- let(:current_resource) do
- provider.load_current_resource
- provider.current_resource
- end
-
- before(:all) do
- File.delete("/etc/init.d/inittest") if File.exists?("/etc/init.d/inittest")
- FileUtils.cp((File.join(File.dirname(__FILE__), "/../assets/inittest")).to_s, "/etc/init.d/inittest")
- FileUtils.chmod(0755, "/etc/init.d/inittest")
- end
-
- after(:all) do
- File.delete("/etc/init.d/inittest") if File.exists?("/etc/init.d/inittest")
- end
-
- before(:each) do
- delete_test_files
- end
-
- after(:each) do
- delete_test_files
- end
-
- describe "start service" do
- it "should start the service" do
- new_resource.run_action(:start)
- service_should_be_started("inittest.txt")
- expect(new_resource).to be_updated_by_last_action
- end
-
- it "should be idempotent" do
- new_resource.run_action(:start)
- service_should_be_started("inittest.txt")
- expect(new_resource).to be_updated_by_last_action
- new_resource.run_action(:start)
- service_should_be_started("inittest.txt")
- expect(new_resource).not_to be_updated_by_last_action
- end
- end
-
- describe "stop service" do
- before do
- new_resource.run_action(:start)
- end
-
- it "should stop the service" do
- new_resource.run_action(:stop)
- service_should_be_stopped("inittest.txt")
- expect(new_resource).to be_updated_by_last_action
- end
-
- it "should be idempotent" do
- new_resource.run_action(:stop)
- service_should_be_stopped("inittest.txt")
- expect(new_resource).to be_updated_by_last_action
- new_resource.run_action(:stop)
- service_should_be_stopped("inittest.txt")
- expect(new_resource).not_to be_updated_by_last_action
- end
- end
-
- describe "restart service" do
- before do
- new_resource.run_action(:start)
- end
-
- it "should restart the service" do
- new_resource.run_action(:restart)
- service_should_be_started("inittest_restart.txt")
- expect(new_resource).to be_updated_by_last_action
- end
-
- it "should be idempotent" do
- skip "FIXME: restart is not idempotent"
- new_resource.run_action(:restart)
- service_should_be_disabled
- expect(new_resource).to be_updated_by_last_action
- new_resource.run_action(:restart)
- service_should_be_disabled
- expect(new_resource).not_to be_updated_by_last_action
- end
- end
-
- describe "reload service" do
- before do
- new_resource.run_action(:start)
- end
-
- it "should reload the service" do
- new_resource.run_action(:reload)
- service_should_be_started("inittest_reload.txt")
- expect(new_resource).to be_updated_by_last_action
- end
-
- it "should be idempotent" do
- skip "FIXME: reload is not idempotent"
- new_resource.run_action(:reload)
- service_should_be_disabled
- expect(new_resource).to be_updated_by_last_action
- new_resource.run_action(:reload)
- service_should_be_disabled
- expect(new_resource).not_to be_updated_by_last_action
- end
- end
-
- describe "enable service" do
- it "should enable the service" do
- new_resource.run_action(:enable)
- service_should_be_enabled
- expect(new_resource).to be_updated_by_last_action
- end
-
- it "should be idempotent" do
- new_resource.run_action(:enable)
- service_should_be_enabled
- new_resource.run_action(:enable)
- service_should_be_enabled
- expect(new_resource).not_to be_updated_by_last_action
- end
- end
-
- describe "disable_service" do
- it "should disable the service" do
- new_resource.run_action(:disable)
- service_should_be_disabled
- expect(new_resource).to be_updated_by_last_action
- end
-
- it "should be idempotent" do
- new_resource.run_action(:disable)
- service_should_be_disabled
- new_resource.run_action(:disable)
- service_should_be_disabled
- expect(new_resource).not_to be_updated_by_last_action
- end
- end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 49e8d2f8f5..920bd75dba 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -169,7 +169,6 @@ 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 sles11: true unless sles11?
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 e92da37043..9f3ef74a11 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -174,10 +174,6 @@ def rhel6?
rhel? && !!(ohai[:platform_version].to_i == 6)
end
-def sles11?
- suse? && !!(ohai[:platform_version].to_i == 11)
-end
-
def rhel7?
rhel? && !!(ohai[:platform_version].to_i == 7)
end