install libxcrypt-compat required by SPEC CPU in all EL systems

PiperOrigin-RevId: 697748309
GoogleCloudPlatform · Nov 18, 2024 · f35ed6f · f35ed6f
1 parent 76f62a2
commit f35ed6f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/perfkitbenchmarker/linux_packages/speccpu.py b/perfkitbenchmarker/linux_packages/speccpu.py
@@ -19,9 +19,11 @@
 import os
 import posixpath
 import re
+
 from absl import flags
 from perfkitbenchmarker import data
 from perfkitbenchmarker import errors
+from perfkitbenchmarker import os_types
 from perfkitbenchmarker import sample
 from perfkitbenchmarker import stages
 from perfkitbenchmarker.linux_packages import build_tools
@@ -356,6 +358,9 @@ def Install(vm):
   vm.Install('fortran')
   vm.Install('build_tools')
 
+  if vm.OS_TYPE in os_types.EL_OS_TYPES:
+    vm.InstallPackages('libxcrypt-compat')
+
   # If runspec_build_tool_version is not set,
   # install 4.7 gcc/g++/gfortan. If either one of the flag is set, we assume
   # user is smart

diff --git a/perfkitbenchmarker/os_types.py b/perfkitbenchmarker/os_types.py
@@ -154,6 +154,16 @@
     AMAZON_NEURON,
 ]
 
+EL_OS_TYPES = [
+    CENTOS_TYPES,
+    RHEL8,
+    RHEL9,
+    ROCKY_LINUX8,
+    ROCKY_LINUX8_OPTIMIZED,
+    ROCKY_LINUX9,
+    ROCKY_LINUX9_OPTIMIZED,
+]
+
 ALL = LINUX_OS_TYPES + WINDOWS_OS_TYPES
 BASE_OS_TYPES = [CLEAR, CORE_OS, DEBIAN, RHEL, WINDOWS]