Merge pull request #587 from mhashizume/PA-4582/master/remove_ubuntu_…

…1404 (PA-4582) Removes Ubuntu 14.04
puppetlabs · Sep 30, 2022 · ed63985 · ed63985
2 parents 4d1ee03 + 65f0d89
commit ed63985
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 59 deletions.
diff --git a/configs/components/boost.rb b/configs/components/boost.rb
@@ -117,7 +117,7 @@
     pkg.environment "CXXFLAGS", "-pthread"
     pkg.environment "PATH", "/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)"
     linkflags = "-Wl,-L#{settings[:libdir]},-L/opt/pl-build-tools/lib"
-  elsif platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
+  elsif platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-18.04-amd64/
     pkg.environment "PATH", "/opt/pl-build-tools/bin:#{settings[:bindir]}:$(PATH)"
     linkflags = "-Wl,-rpath=#{settings[:libdir]},-rpath=#{settings[:libdir]}64"
   else

diff --git a/configs/components/ruby-2.5.9.rb b/configs/components/ruby-2.5.9.rb
@@ -116,8 +116,6 @@
     'sles-12-ppc64le',
     'solaris-10-sparc',
     'solaris-11-sparc',
-    'ubuntu-14.04-amd64',
-    'ubuntu-14.04-i386',
     'windows-2012r2-x64',
     'windows-2012r2-x86',
     'windows-2019-x64',

diff --git a/configs/components/runtime-agent.rb b/configs/components/runtime-agent.rb
@@ -43,7 +43,7 @@
     pkg.install_file "#{settings[:tools_root]}/bin/libiconv-2.dll", "#{settings[:ruby_bindir]}/libiconv-2.dll"
     pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll"
   elsif platform.is_solaris? ||
-        platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
+        platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-18.04-amd64/
     pkg.install do
       "bash runtime.sh #{libdir} puppet"
     end

diff --git a/configs/components/yaml-cpp.rb b/configs/components/yaml-cpp.rb
@@ -34,7 +34,7 @@
     pkg.environment "CYGWIN", settings[:cygwin]
     cmake = "C:/ProgramData/chocolatey/bin/cmake.exe -G \"MinGW Makefiles\""
     cmake_toolchain_file = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
-  elsif platform.is_aix? || platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
+  elsif platform.is_aix? || platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-18.04-amd64/
     cmake = "#{settings[:tools_root]}/bin/cmake"
     cmake_toolchain_file = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
   else

diff --git a/configs/platforms/ubuntu-14.04-amd64.rb b/configs/platforms/ubuntu-14.04-amd64.rb
diff --git a/configs/platforms/ubuntu-14.04-i386.rb b/configs/platforms/ubuntu-14.04-i386.rb
diff --git a/configs/projects/_shared-agent-components.rb b/configs/projects/_shared-agent-components.rb
@@ -32,7 +32,7 @@
 proj.component 'ruby-shadow' unless platform.is_aix? || platform.is_windows?
 # We only build ruby-selinux for EL, Fedora, Debian and Ubuntu (amd64/i386)
 if platform.is_el? || platform.is_fedora? || platform.name =~ /debian|ubuntu/
-  if platform.name !~ /ubuntu-.*-ppc64el|ubuntu-14.04/
+  if platform.name !~ /ubuntu-.*-ppc64el/
     proj.component 'ruby-selinux'
   end
 end