From bbe37abf964dfe76f8279af887b2da4fd8dc3f3f Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 5 Oct 2023 12:13:10 +0200 Subject: [PATCH] Drop Ubuntu 16.04 from PIDFILE_COMPATIBLE_IMAGES 16.04 is long EOL --- lib/puppet_metadata/beaker.rb | 3 --- spec/beaker_spec.rb | 1 - 2 files changed, 4 deletions(-) diff --git a/lib/puppet_metadata/beaker.rb b/lib/puppet_metadata/beaker.rb index 3954d56..379c9d1 100644 --- a/lib/puppet_metadata/beaker.rb +++ b/lib/puppet_metadata/beaker.rb @@ -10,9 +10,6 @@ class Beaker 'CentOS' => { '7' => 'centos:7.6.1810', }, - 'Ubuntu' => { - '16.04' => 'ubuntu:xenial-20191212', - }, }.freeze # There is no CentOS 8 image that works with PIDFile in systemd diff --git a/spec/beaker_spec.rb b/spec/beaker_spec.rb index d7be94a..ba956aa 100644 --- a/spec/beaker_spec.rb +++ b/spec/beaker_spec.rb @@ -28,7 +28,6 @@ ['CentOS', '7', ['centos7-64{image=centos:7.6.1810}', 'CentOS 7']], ['CentOS', '8', nil], ['CentOS', '9', ['centos9-64', 'CentOS 9']], - ['Ubuntu', '16.04', ['ubuntu1604-64{image=ubuntu:xenial-20191212}', 'Ubuntu 16.04']], ['Ubuntu', '18.04', ['ubuntu1804-64', 'Ubuntu 18.04']], ].each do |os, release, expected| it { expect(described_class.os_release_to_setfile(os, release, pidfile_workaround: true)).to eq(expected) }