Merge pull request #499 from jpartlow/add-arm64-support-to-acceptance-8.x

Add arm64 support to acceptance 8.x

Author: jpartlow

.github/workflows/acceptance.yml

@@ -1,7 +1,8 @@
 ---
 name: Beaker OpenVox Acceptance Tests
 run-name: |-
-  Beaker acceptance tests of openvox for
+  Beaker acceptance tests of openvox
+  on ${{ inputs.guest-arch }} runners for
   ${{ inputs.pre-release-build && 'pre-release' || 'release' }}
   packages of openvox-agent
   ${{ (inputs.pre-release-build && inputs.openvox-agent-version) ||
@@ -80,6 +81,20 @@ on:
           true)
         default: 'https://s3.osuosl.org/openvox-artifacts'
         type: string
+      guest-arch:
+        description: |-
+          The architecture of the guest VMs to run the acceptance tests
+          on. This is used by the nested_vms action to determine which
+          VM images to use.
+
+          If not provided, the default is x86_64.
+
+          NOTE: Currently only x86_64 *runners* support nested
+          virtualization, so if guest-arch is set to arm64, the
+          nested_vms will run under qemu and be quite a bit slower
+          (5x-20x).
+        type: string
+        default: 'x86_64'
 
 permissions:
   contents: read
@@ -103,3 +118,4 @@ jobs:
       openvox-server-version: ${{ inputs.openvox-server-version }}
       openvox-server-pre-release-build: ${{ inputs.pre-release-build }}
       artifacts-url: ${{ inputs.artifacts-url }}
+      guest-arch: ${{ inputs.guest-arch }}

acceptance/pre-suite/010_set_puppetserver_memory_defaults.rb

@@ -12,7 +12,13 @@
                  end
 
   if half_mem > 2048
-    on(master, "sed -i -E -e '/^JAVA_ARGS=/ s/-Xms[0-9]+[m|g] -Xmx[0-9]+[m|g]/-Xms#{half_mem}m -Xmx#{half_mem}m/' #{defaults_dir}/puppetserver")
+    mem_regex       = "-Xms[0-9]+[m|g][[:blank:]]+-Xmx[0-9]+[m|g]"
+    mem_replacement = "-Xms#{half_mem}m -Xmx#{half_mem}m"
+    on(master, <<~EOS)
+      sed -i -E \
+        -e '/^JAVA_ARGS=/ s/#{mem_regex}/#{mem_replacement}/' \
+        #{defaults_dir}/puppetserver
+    EOS
     on(master, "cat #{defaults_dir}/puppetserver")
   else
     logger.info("System memory on the primary is less than 4GB (#{(mem_in_bytes.to_i / megabytes)}m). Leaving the defult 2GB for Puppetserver memory.")

acceptance/pre-suite/011_set_puppetserver_timeouts.rb

@@ -0,0 +1,34 @@
+test_name 'Set Puppetserver start and reload timeouts' do
+  skip_test 'No primary node to configure Puppetserver timeouts for' unless master
+
+  start_timeout = options['puppetserver-start-timeout']
+  reload_timeout = options['puppetserver-reload-timeout']
+  skip_test 'No timeout options specified, skipping' if (start_timeout.nil? && reload_timeout.nil?)
+
+  # Update the defaults used internally by the puppetserver
+  # service scripts.
+  defaults_dir = case master.platform
+                 when /debian|ubuntu/ then  '/etc/default'
+                 else '/etc/sysconfig'
+                 end
+
+  exprs = []
+  exprs <<  "-e '/^START_TIMEOUT=/ s/=.*$/=#{start_timeout}/'" if !start_timeout.nil?
+  exprs <<  "-e '/^RELOAD_TIMEOUT=/ s/=.*$/=#{reload_timeout}/'" if !reload_timeout.nil?
+  on(master, "sed -i #{exprs.join(' ')} #{defaults_dir}/puppetserver")
+  on(master, "cat #{defaults_dir}/puppetserver")
+
+  # And update the defaults used by the systemd service unit.
+  # Puppetserver will effectively timeout a start at whichever
+  # is shorter...
+  if !start_timeout.nil?
+    dropin_dir = '/etc/systemd/system/puppetserver.service.d'
+    on(master, <<~EOS)
+      mkdir -p #{dropin_dir}
+      printf '[Service]\\nTimeoutStartSec=#{start_timeout}\\n' \
+        > #{dropin_dir}/timeouts.conf
+    EOS
+    on(master, 'systemctl daemon-reload')
+    on(master, 'systemctl cat puppetserver.service')
+  end
+end

acceptance/tests/agent/agent_disable_lockfile.rb

@@ -3,7 +3,8 @@
                          # The validation of the `vardir` at the OS level
                          # should be accomplished in another test.
     'audit:high',
-    'audit:refactor'     # This test should not require a master. Remove the use of `with_puppet_running_on`.
+    'audit:refactor',    # This test should not require a master. Remove the use of `with_puppet_running_on`.
+    'shard:group1' # For splitting out groups of tests for slow test runners
 
 #
 # This test is intended to ensure that puppet agent --enable/--disable

acceptance/tests/agent/agent_fails_with_unknown_resource.rb

@@ -1,6 +1,7 @@
 test_name "agent run should fail if it finds an unknown resource type" do
   tag 'audit:high',
-      'audit:integration'
+      'audit:integration',
+      'shard:group2' # For splitting out groups of tests for slow test runners
 
   require 'puppet/acceptance/common_utils'
 

acceptance/tests/agent/agent_parses_json_catalog.rb

@@ -4,7 +4,8 @@
     'audit:high',        # tests defined catalog format
     'audit:integration', # There is no OS specific risk here.
     'server',
-    'catalog:json'
+    'catalog:json',
+    'shard:group3' # For splitting out groups of tests for slow test runners
 
 require 'puppet/acceptance/common_utils'
 require 'json'

acceptance/tests/agent/fallback_to_cached_catalog.rb

@@ -2,7 +2,8 @@
 
 tag 'audit:high',
     'audit:integration', # This test is not OS sensitive.
-    'audit:refactor'     # A catalog fixture can be used for this test. Remove the usage of `with_puppet_running_on`.
+    'audit:refactor',    # A catalog fixture can be used for this test. Remove the usage of `with_puppet_running_on`.
+    'shard:group4' # For splitting out groups of tests for slow test runners
 
 step "run agents once to cache the catalog" do
   with_puppet_running_on master, {} do

acceptance/tests/agent/last_run_summary_report.rb

@@ -1,5 +1,6 @@
 test_name "The 'last_run_summary.yaml' report has the right location and permissions" do
-  tag 'audit:high'
+  tag 'audit:high',
+      'shard:group1' # For splitting out groups of tests for slow test runners
 
   require 'puppet/acceptance/temp_file_utils'
   extend Puppet::Acceptance::TempFileUtils

acceptance/tests/aix/aix_package_provider.rb

@@ -1,7 +1,8 @@
 test_name "aix package provider should work correctly" do
 
   tag 'audit:high',
-      'audit:acceptance'  # OS specific by definition.
+      'audit:acceptance', # OS specific by definition.
+      'shard:group2' # For splitting out groups of tests for slow test runners
 
   confine :to, :platform => /aix/
 

acceptance/tests/aix/nim_package_provider.rb

@@ -1,7 +1,8 @@
 test_name "NIM package provider should work correctly"
 
 tag 'audit:high',
-    'audit:acceptance'  # OS specific by definition
+    'audit:acceptance', # OS specific by definition
+    'shard:group3' # For splitting out groups of tests for slow test runners
 
 # nim test is slow, confine to only aix 7.2 and recent puppet versions
 confine :to, :platform => "aix" do |aix|