Skip to content

Commit 4c8aa54

Browse files
(FACT-3438) Handle os.architecture fact for debian aarch64
1 parent 8c441ac commit 4c8aa54

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

acceptance/lib/facter/acceptance/base_fact_utils.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,15 @@ def debian_expected_facts(agent)
7979
if agent['platform'] =~ /amd64/
8080
os_arch = 'amd64'
8181
os_hardware = 'x86_64'
82+
processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
83+
elsif agent['platform'] =~ /aarch64/
84+
os_arch = 'aarch64'
85+
os_hardware = 'aarch64'
86+
processor_model_pattern = // # FACT-3439 - facter doesn't figure out the processor type on these machines
8287
else
8388
os_arch = 'i386'
8489
os_hardware = 'i686'
90+
processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
8591
end
8692

8793
expected_facts = {
@@ -101,7 +107,7 @@ def debian_expected_facts(agent)
101107
'processors.count' => /[1-9]/,
102108
'processors.physicalcount' => /[1-9]/,
103109
'processors.isa' => /unknown|#{os_hardware}/,
104-
'processors.models' => /(Intel\(R\).*)|(AMD.*)/,
110+
'processors.models' => processor_model_pattern,
105111
'kernel' => 'Linux',
106112
'kernelrelease' => /\d+\.\d+\.\d+/,
107113
'kernelversion' => /\d+\.\d+/,

0 commit comments

Comments
 (0)