Merge pull request #2505 from cthorn42/maint/3.x/another_macos_12_arm…

…64_testing_attempt (maint) Two more macos 12 arm64 testing updates
puppetlabs · Jul 12, 2022 · 91ed8a2 · 91ed8a2
2 parents 16601d4 + 8cc1bbb
commit 91ed8a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/acceptance/lib/facter/acceptance/base_fact_utils.rb b/acceptance/lib/facter/acceptance/base_fact_utils.rb
@@ -351,9 +351,13 @@ def osx_expected_facts(agent)
         if agent['platform'] =~ /x86_64/
           os_arch                 = 'x86_64'
           os_hardware             = 'x86_64'
+          processors_isa          = 'i386'
+          processors_models       = /"Intel\(R\).*"/
         elsif agent['platform'] =~ /arm64/
           os_arch                 = 'arm64'
           os_hardware             = 'arm64'
+          processors_isa          = 'arm'
+          processors_models       = /"Apple M1.*"/
         end
         expected_facts = {
             'os.architecture'          => os_arch,
@@ -370,8 +374,8 @@ def osx_expected_facts(agent)
             'os.release.minor'         => /\d+/,
             'processors.count'         => /[1-9]/,
             'processors.physicalcount' => /[1-9]/,
-            'processors.isa'           => 'i386',
-            'processors.models'        => /"Intel\(R\).*"/,
+            'processors.isa'           => processors_isa,
+            'processors.models'        => processors_models,
             'kernel'                   => 'Darwin',
             'kernelrelease'            => /\d+\.\d+\.\d+/,
             'kernelversion'            => /\d+\.\d+\.\d+/,

diff --git a/acceptance/tests/facts/ruby.rb b/acceptance/tests/facts/ruby.rb
@@ -17,7 +17,7 @@
         when /windows/
           ruby_platform = agent['ruby_arch'] == 'x64' ? 'x64-mingw32' : 'i386-mingw32'
         when /osx/
-          ruby_platform = /(x86_64|aarch64)-darwin[\d.]+/
+          ruby_platform = /(x86_64-darwin[\d.]+|aarch64-darwin)/
         when /aix/
           ruby_platform = /powerpc-aix[\d.]+/
         when /solaris/