From caa0691a0e959d89e13c99360fdf8fc82d9e9d1a Mon Sep 17 00:00:00 2001 From: david22swan Date: Fri, 25 Mar 2022 14:15:09 +0000 Subject: [PATCH] (GH-iac-334) Remove code specific to unsupported OSs --- spec/acceptance/compose_v3_spec.rb | 6 +--- spec/acceptance/docker_custom_source_spec.rb | 7 +---- spec/acceptance/docker_full_spec.rb | 12 ++------ spec/acceptance/docker_spec.rb | 6 +--- spec/acceptance/network_spec.rb | 3 -- spec/acceptance/plugin_spec.rb | 2 -- spec/acceptance/stack_spec.rb | 6 +--- spec/acceptance/volume_spec.rb | 3 -- spec/helper/get_defaults.rb | 31 ++++++-------------- spec/shared_examples/params.rb | 30 +++++++++---------- 10 files changed, 30 insertions(+), 76 deletions(-) diff --git a/spec/acceptance/compose_v3_spec.rb b/spec/acceptance/compose_v3_spec.rb index 2c681352..f6fd718c 100644 --- a/spec/acceptance/compose_v3_spec.rb +++ b/spec/acceptance/compose_v3_spec.rb @@ -13,11 +13,7 @@ 'nanoserver-sac2016' end else - docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04' - "version => '18.06.1~ce~3-0~ubuntu'" - else - '' - end + docker_args = '' install_dir = '/usr/local/bin' file_extension = '' tmp_path = '/tmp' diff --git a/spec/acceptance/docker_custom_source_spec.rb b/spec/acceptance/docker_custom_source_spec.rb index 0f0f27ce..4911fd70 100644 --- a/spec/acceptance/docker_custom_source_spec.rb +++ b/spec/acceptance/docker_custom_source_spec.rb @@ -11,16 +11,11 @@ default_docker_run_arg = "restart => 'always', net => 'nat'," default_run_command = 'ping 127.0.0.1 -t' docker_command = '"/cygdrive/c/Program Files/Docker/docker"' - skip = false -elsif os[:name] == 'Ubuntu' && os[:release][:full] == '14.04' - docker_args = "version => '18.06.1~ce~3-0~ubuntu'" - default_image = 'busybox' - skip = true else docker_args = '' default_image = 'busybox' - skip = false end +skip = false describe 'the Puppet Docker module' do context 'with download location', skip: skip do diff --git a/spec/acceptance/docker_full_spec.rb b/spec/acceptance/docker_full_spec.rb index 5659797f..82b5cc1b 100644 --- a/spec/acceptance/docker_full_spec.rb +++ b/spec/acceptance/docker_full_spec.rb @@ -26,11 +26,7 @@ docker_mount_path = 'C:/Users/Public/DockerVolume' storage_driver = 'windowsfilter' else - docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04' - "version => '18.06.1~ce~3-0~ubuntu'" - else - '' - end + docker_args = '' default_image = 'alpine' second_image = 'busybox' default_image_tag = '3.7' @@ -45,9 +41,7 @@ default_docker_exec_command = 'touch /root/test_file.txt' docker_mount_path = '/root' storage_driver = 'devicemapper' - storage_driver = if os[:family] == 'Debian' && os[:release][:major] =~ %r{14.04|^8$} - 'aufs' - elsif os[:family] == 'RedHat' + storage_driver = if os[:family] == 'RedHat' 'devicemapper' else 'overlay2' @@ -823,7 +817,7 @@ class { 'docker': #{docker_args} } if os[:family] == 'windows' apply_manifest(pp5, catch_failures: true) - elsif %r{14.04|^8$}.match?(os[:release]) + elsif %r{^8$}.match?(os[:release]) apply_manifest(pp5, catch_failures: true) do |r| expect(r.stdout).to match(%r{container_3_7_3}) end diff --git a/spec/acceptance/docker_spec.rb b/spec/acceptance/docker_spec.rb index ba0e525c..c60e88e1 100644 --- a/spec/acceptance/docker_spec.rb +++ b/spec/acceptance/docker_spec.rb @@ -21,11 +21,7 @@ bad_server_strip = "#{registry_host}_5001" broken = true else - docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04' - "version => '18.06.1~ce~3-0~ubuntu'" - else - '' - end + docker_args = '' docker_registry_image = 'registry' docker_network = 'bridge' registry_host = '127.0.0.1' diff --git a/spec/acceptance/network_spec.rb b/spec/acceptance/network_spec.rb index 3de738f4..bd95c99e 100644 --- a/spec/acceptance/network_spec.rb +++ b/spec/acceptance/network_spec.rb @@ -9,9 +9,6 @@ if os[:family] == 'windows' puts 'Not implemented on Windows' broken = true -elsif os[:name] == 'ubuntu' && os[:release][:full] == '14.04' - docker_args = "version => '18.06.1~ce~3-0~ubuntu'" -else docker_args = '' end diff --git a/spec/acceptance/plugin_spec.rb b/spec/acceptance/plugin_spec.rb index 29290b12..7d4f1180 100644 --- a/spec/acceptance/plugin_spec.rb +++ b/spec/acceptance/plugin_spec.rb @@ -9,8 +9,6 @@ if os[:family] == 'windows' puts 'Not implemented on Windows' broken = true -elsif os[:name] == 'ubuntu' && os[:release][:full] == '14.04' - docker_args = "version => '18.06.1~ce~3-0~ubuntu'" else docker_args = '' end diff --git a/spec/acceptance/stack_spec.rb b/spec/acceptance/stack_spec.rb index 6cc8d0c0..7d25c1ac 100644 --- a/spec/acceptance/stack_spec.rb +++ b/spec/acceptance/stack_spec.rb @@ -7,11 +7,7 @@ tmp_path = 'C:\\tmp\\' wait_for_container_seconds = 120 else - docker_args = if os[:name] == 'ubuntu' && os[:release][:full] == '14.04' - "version => '18.06.1~ce~3-0~ubuntu'" - else - '' - end + docker_args = '' tmp_path = '/tmp/' wait_for_container_seconds = 10 end diff --git a/spec/acceptance/volume_spec.rb b/spec/acceptance/volume_spec.rb index c8e67a1c..cb95e540 100644 --- a/spec/acceptance/volume_spec.rb +++ b/spec/acceptance/volume_spec.rb @@ -7,9 +7,6 @@ if os[:family] == 'windows' docker_args = 'docker_ee => true' command = '"/cygdrive/c/Program Files/Docker/docker"' -elsif os[:name] == 'ubuntu' && os[:release][:full] == '14.04' - docker_args = "version => '18.06.1~ce~3-0~ubuntu'" - command = 'docker' else docker_args = '' command = 'docker' diff --git a/spec/helper/get_defaults.rb b/spec/helper/get_defaults.rb index 89336759..a7d883e2 100644 --- a/spec/helper/get_defaults.rb +++ b/spec/helper/get_defaults.rb @@ -112,28 +112,15 @@ def get_defaults(_facts) case _facts[:os]['name'] when 'Ubuntu' package_release = "ubuntu-#{_facts[:os]['distro']['codename']}" - - if _facts[:os]['release']['full'] != '14.04' - service_after_override = :undef - service_config_template = 'docker/etc/sysconfig/docker.systemd.erb' - service_hasrestart = true - service_hasstatus = true - service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb' - service_provider = 'systemd' - socket_override = false - socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb' - storage_config = '/etc/default/docker-storage' - else - service_after_override = :undef - service_config_template = 'docker/etc/default/docker.erb' - service_hasrestart = false - service_hasstatus = true - service_overrides_template = :undef - service_provider = 'upstart' - socket_override = false - socket_overrides_template = :undef - storage_config = :undef - end + service_after_override = :undef + service_config_template = 'docker/etc/sysconfig/docker.systemd.erb' + service_hasrestart = true + service_hasstatus = true + service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb' + service_provider = 'systemd' + socket_override = false + socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb' + storage_config = '/etc/default/docker-storage' else package_release = "debian-#{_facts[:os]['distro']['codename']}" service_after_override = :undef diff --git a/spec/shared_examples/params.rb b/spec/shared_examples/params.rb index 84571245..48290543 100644 --- a/spec/shared_examples/params.rb +++ b/spec/shared_examples/params.rb @@ -3,21 +3,19 @@ shared_examples 'params' do |_facts| case _facts[:os]['family'] when 'Debian' - if _facts[:os]['release']['full'] != '14.04' - it { - is_expected.to contain_class('docker::params') - is_expected.to contain_class('docker::systemd_reload') - is_expected.to contain_exec('docker-systemd-reload').with( - 'path' => [ - '/bin/', - '/sbin/', - '/usr/bin/', - '/usr/sbin/', - ], - 'command' => 'systemctl daemon-reload', - 'refreshonly' => 'true', - ) - } - end + it { + is_expected.to contain_class('docker::params') + is_expected.to contain_class('docker::systemd_reload') + is_expected.to contain_exec('docker-systemd-reload').with( + 'path' => [ + '/bin/', + '/sbin/', + '/usr/bin/', + '/usr/sbin/', + ], + 'command' => 'systemctl daemon-reload', + 'refreshonly' => 'true', + ) + } end end