Mentions légales du service

Skip to content
Snippets Groups Projects
Commit da4d0e78 authored by DOAN Lancelot's avatar DOAN Lancelot
Browse files

[CPU] Modify regex for g5k-checks to get version when it contains a letter

parent 75fbace4
Branches
No related tags found
1 merge request!96[CPU] Modify regex
Pipeline #1207582 passed
...@@ -43,7 +43,7 @@ Ohai.plugin(:Cpu) do ...@@ -43,7 +43,7 @@ Ohai.plugin(:Cpu) do
# All Xeon CPUs before Skylake (e.g. "Intel(R) Xeon(R) CPU X vY @ Z" or "Intel(R) Xeon(R) CPU X 0 @ Z" ) # All Xeon CPUs before Skylake (e.g. "Intel(R) Xeon(R) CPU X vY @ Z" or "Intel(R) Xeon(R) CPU X 0 @ Z" )
if cpu[:'0'][:model_name] =~ /Intel\(R\) Xeon\(R\) CPU\s+(.+?)(?:\s0)?\s+@/ || if cpu[:'0'][:model_name] =~ /Intel\(R\) Xeon\(R\) CPU\s+(.+?)(?:\s0)?\s+@/ ||
cpu[:'0'][:model_name] =~ /Intel\(R\) Xeon\(R\)\s+(.+)\s+CPU\s+@/ || cpu[:'0'][:model_name] =~ /Intel\(R\) Xeon\(R\)\s+(.+)\s+CPU\s+@/ ||
cpu[:'0'][:model_name] =~ /Intel\(R\) Xeon\(R\)\s+(.+\s+.+)/ || cpu[:'0'][:model_name] =~ /Intel\(R\) Xeon\(R\)\s+(.+)/ ||
cpu[:'0'][:model_name] =~ /Intel\(R\) Pentium\(R\) CPU (.+)\s+@/ cpu[:'0'][:model_name] =~ /Intel\(R\) Pentium\(R\) CPU (.+)\s+@/
cpu[:version] = Regexp.last_match(1) cpu[:version] = Regexp.last_match(1)
# Xeon Skylake and after (e.g. "Intel(R) Xeon(R) Gold X CPU @ Z") # Xeon Skylake and after (e.g. "Intel(R) Xeon(R) Gold X CPU @ Z")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment