support acceptance tests on ubuntu

Author: h0tw1r3

spec/acceptance/lib/solaris_util.rb

@@ -1,5 +1,9 @@
 OPTS = { poolpath: '/ztstpool', pool: 'tstpool', fs: 'tstfs' }.freeze
 
+def os_mkfile_command(agent)
+  agent['platform'].include?('solaris') ? 'mkfile' : 'truncate --size'
+end
+
 def zfs_clean(agent, o = {})
   o = OPTS.merge(o)
   on agent, "zfs destroy -f -r #{o[:pool]}/#{o[:fs]} ||:"
@@ -11,7 +15,7 @@ def zfs_setup(agent, o = {})
   o = OPTS.merge(o)
   on agent, "mkdir -p #{o[:poolpath]}/mnt"
   on agent, "mkdir -p #{o[:poolpath]}/mnt2"
-  on agent, "mkfile 64m #{o[:poolpath]}/dsk"
+  on agent, "#{os_mkfile_command(agent)} 64m #{o[:poolpath]}/dsk"
   on agent, "zpool create #{o[:pool]} #{o[:poolpath]}/dsk"
 end
 
@@ -24,6 +28,6 @@ def zpool_clean(agent, o = {})
 def zpool_setup(agent, o = {})
   o = OPTS.merge(o)
   on agent, "mkdir -p #{o[:poolpath]}/mnt||:"
-  on agent, "mkfile 100m #{o[:poolpath]}/dsk1 #{o[:poolpath]}/dsk2 #{o[:poolpath]}/dsk3 #{o[:poolpath]}/dsk5 ||:"
-  on agent, "mkfile 50m #{o[:poolpath]}/dsk4 ||:"
+  on agent, "#{os_mkfile_command} 100m #{o[:poolpath]}/dsk1 #{o[:poolpath]}/dsk2 #{o[:poolpath]}/dsk3 #{o[:poolpath]}/dsk5 ||:"
+  on agent, "#{os_mkfile_command} 50m #{o[:poolpath]}/dsk4 ||:"
 end

spec/acceptance/nodesets/default.yml

@@ -12,6 +12,18 @@ HOSTS:
     roles:
     - agent
     - default
+  ubuntu22-64-1:
+    pe_dir:
+    pe_ver:
+    pe_upgrade_dir:
+    pe_upgrade_ver:
+    hypervisor: vmpooler
+    platform: ubuntu-22.04-amd64
+    packaging_platform: ubuntu-22.04-amd64
+    template: ubuntu-2204-x86_64
+    roles:
+    - agent
+    - default
 CONFIG:
   type: agent
   nfs_server: none

spec/acceptance/tests/zpool/basic_tests_spec.rb

@@ -3,19 +3,19 @@
 RSpec.context 'ZPool: Basic Tests' do
   before(:all) do
     # ZPool: setup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_setup agent
     end
   end
 
   after(:all) do
     # ZPool: cleanup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_clean agent
     end
   end
 
-  solaris_agents.each do |agent|
+  agents.each do |agent|
     it 'can create an idempotent zpool resource' do
       # ZPool: create zpool disk
       apply_manifest_on(agent, "zpool{ tstpool: ensure=>present, disk=>'/ztstpool/dsk1' }") do

spec/acceptance/tests/zpool/should_be_idempotent_spec.rb

@@ -3,19 +3,19 @@
 RSpec.context 'ZPool: Should be Idempotent' do
   before(:all) do
     # ZPool: setup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_setup agent
     end
   end
 
   after(:all) do
     # ZPool: cleanup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_clean agent
     end
   end
 
-  solaris_agents.each do |agent|
+  agents.each do |agent|
     it 'creates an idempotent resource' do
       # ZPool: ensure create
       apply_manifest_on(agent, "zpool{ tstpool: ensure=>present, disk=>'/ztstpool/dsk1' }") do

spec/acceptance/tests/zpool/should_create_spec.rb

@@ -3,19 +3,19 @@
 RSpec.context 'ZPool: Should Create' do
   before(:all) do
     # ZPool: setup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_setup agent
     end
   end
 
   after(:all) do
     # ZPool: cleanup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_clean agent
     end
   end
 
-  solaris_agents.each do |agent|
+  agents.each do |agent|
     it 'creates a zpool resource' do
       # ZPool: ensure create
       apply_manifest_on(agent, "zpool{ tstpool: ensure=>present, disk=>'/ztstpool/dsk1' }") do

spec/acceptance/tests/zpool/should_query_spec.rb

@@ -3,19 +3,19 @@
 RSpec.context 'ZPool: Should Query' do
   before(:all) do
     # ZPool: setup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_setup agent
     end
   end
 
   after(:all) do
     # ZPool: cleanup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_clean agent
     end
   end
 
-  solaris_agents.each do |agent|
+  agents.each do |agent|
     it 'queries both manages and unmanages zpool resources' do
       # ZPool: ensure create
       apply_manifest_on(agent, "zpool{ tstpool: ensure=>present, disk=>'/ztstpool/dsk1' }") do

spec/acceptance/tests/zpool/should_remove_spec.rb

@@ -3,19 +3,19 @@
 RSpec.context 'ZPool: Should Remove' do
   before(:all) do
     # ZPool: setup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_setup agent
     end
   end
 
   after(:all) do
     # ZPool: cleanup
-    solaris_agents.each do |agent|
+    agents.each do |agent|
       zpool_clean agent
     end
   end
 
-  solaris_agents.each do |agent|
+  agents.each do |agent|
     it 'removes a specified resource' do
       # ZPool: create
       on(agent, 'zpool create tstpool /ztstpool/dsk1')

spec/spec_helper_acceptance.rb

@@ -15,6 +15,10 @@ def solaris_agents
   agents.select { |agent| agent['platform'].include?('solaris') }
 end
 
+def linux_agents
+  agents.select { |agent| agent['platform'].include?('ubuntu') }
+end
+
 RSpec.configure do |c|
   c.before :suite do
     unless ENV['BEAKER_provision'] == 'no'
@@ -55,6 +59,9 @@ def solaris_agents
 
       # Until solaris gets new image we need to add to the cert chain on solaris, call a beaker-puppet setup script to handle this
       hosts.each do |host|
+        if hosts.platform.match? %r{ubuntu}
+          on(host, 'apt -y install zfsutils-linux')
+        end
         next unless host.platform.match? %r{solaris-11(\.2)?-(i386|sparc)}
         create_remote_file(host, 'DigiCertTrustedRootG4.crt.pem', DIGICERT)
         on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')