Add ubuntu 2204 support

kitchen.dokken.yml

@@ -63,3 +63,17 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
+
+- name: ubuntu-20.04
+  driver:
+    image: dokken/ubuntu-20.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: ubuntu-22.04
+  driver:
+    image: dokken/ubuntu-22.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update

kitchen.yml

@@ -22,6 +22,8 @@ platforms:
   - name: oracle-7
   - name: ubuntu-16.04
   - name: ubuntu-18.04
+  - name: ubuntu-20.04
+  - name: ubuntu-22.04
 
 suites:
 - name: default

recipes/default.rb

@@ -37,7 +37,7 @@
   # what is necessary for running runit as pid 1, which we don't care about.
   pv = node['platform_version']
   pkg_name = if (platform?('debian') && pv.to_i >= 9) || \
-                (platform?('ubuntu') && Gem::Version.new(pv) >= Gem::Version.new('17.10'))
+                (platform?('ubuntu') && Gem::Version.new(pv) >= Gem::Version.new('17.10') && Gem::Version.new(pv) < Gem::Version.new('22.04'))
                'runit-systemd'
              else
                'runit'

spec/default_spec.rb

@@ -111,6 +111,32 @@
     end
   end
 
+  context 'on Ubuntu 20.04' do
+    platform 'ubuntu', '20.04'
+
+    it 'installs the runit package' do
+      is_expected.to install_package('runit-systemd')
+    end
+
+    it 'starts and enabled the correct runit service' do
+      is_expected.to enable_service('runit')
+      is_expected.to start_service('runit')
+    end
+  end
+
+  context 'on Ubuntu 22.04' do
+    platform 'ubuntu', '22.04'
+
+    it 'installs the runit package' do
+      is_expected.to install_package('runit')
+    end
+
+    it 'starts and enabled the correct runit service' do
+      is_expected.to enable_service('runit')
+      is_expected.to start_service('runit')
+    end
+  end
+
   context 'on Debian 9' do
     platform 'Debian', '9'
 

test/cookbooks/runit_test/recipes/service.rb

@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+apt_update 'update'
 
 include_recipe 'runit::default'
 

test/integration/default/default_spec.rb

@@ -1,5 +1,5 @@
 if (os[:name] == 'debian' && os[:release].to_i >= 9) || \
-   (os[:name] == 'ubuntu' && Gem::Version.new(os[:release]) >= Gem::Version.new('17.10'))
+   (os[:name] == 'ubuntu' && Gem::Version.new(os[:release]) >= Gem::Version.new('17.10') && Gem::Version.new(os[:release]) < Gem::Version.new('22.04'))
   describe package('runit-systemd') do
     it { should be_installed }
   end

test/integration/service/all_distros_specs.rb

@@ -39,7 +39,7 @@
   end
 
   describe command('file /var/log/default-svlog/*.s') do
-    its(:stdout) { should contain('gzip compressed data') }
+    its(:stdout) { should match(/gzip compressed data/) }
   end
 end