GPU tests: remove deprecated centos7 setup logic

GoogleCloudPlatform · Nov 6, 2024 · 5da2fd5 · 5da2fd5
1 parent 3f42073
commit 5da2fd5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 82 deletions.
diff --git a/integration_test/third_party_apps_test/applications/dcgm/centos_rhel/install b/integration_test/third_party_apps_test/applications/dcgm/centos_rhel/install
@@ -89,36 +89,15 @@ try_install() {
     return 1
 }
 
-handle_rhel7() {
-    install_driver_package() {
-        # Ref: https://docs.nvidia.com/datacenter/tesla/tesla-installation-notes/index.html#centos7
-        # For Centos - we can expect the repo to have the matching version of
-        # kernel packages, and the driver package needs those kernel packages
-        sudo yum install -y kernel-devel-$(uname -r) kernel-headers-$(uname -r)
-        sudo yum -y install nvidia-driver-latest-dkms
-    }
-
-    remove_driver_package() {
-        # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
-        sudo yum -y remove "*nvidia*"
-    }
+install_driver_package() {
+    # Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
+    sudo yum -y module install nvidia-driver
 }
 
-handle_common() {
-    install_driver_package() {
-        # Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
-        sudo yum -y module install nvidia-driver
-    }
-
-    remove_driver_package() {
-        # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
-        sudo yum -y module remove --all nvidia-driver
-    }
+remove_driver_package() {
+    # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
+    sudo yum -y module remove --all nvidia-driver
 }
 
-case "$VERSION_ID" in
-    7) handle_rhel7;;
-    *) handle_common;;
-esac
 try_install install_cuda_from_package_manager install_cuda_from_runfile
 install_dcgm
diff --git a/integration_test/third_party_apps_test/applications/dcgmv1/centos_rhel/install b/integration_test/third_party_apps_test/applications/dcgmv1/centos_rhel/install
@@ -89,36 +89,15 @@ try_install() {
     return 1
 }
 
-handle_rhel7() {
-    install_driver_package() {
-        # Ref: https://docs.nvidia.com/datacenter/tesla/tesla-installation-notes/index.html#centos7
-        # For Centos - we can expect the repo to have the matching version of
-        # kernel packages, and the driver package needs those kernel packages
-        sudo yum install -y kernel-devel-$(uname -r) kernel-headers-$(uname -r)
-        sudo yum -y install nvidia-driver-latest-dkms
-    }
-
-    remove_driver_package() {
-        # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
-        sudo yum -y remove "*nvidia*"
-    }
+install_driver_package() {
+    # Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
+    sudo yum -y module install nvidia-driver
 }
 
-handle_common() {
-    install_driver_package() {
-        # Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
-        sudo yum -y module install nvidia-driver
-    }
-
-    remove_driver_package() {
-        # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
-        sudo yum -y module remove --all nvidia-driver
-    }
+remove_driver_package() {
+    # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
+    sudo yum -y module remove --all nvidia-driver
 }
 
-case "$VERSION_ID" in
-    7) handle_rhel7;;
-    *) handle_common;;
-esac
 try_install install_cuda_from_package_manager install_cuda_from_runfile
 install_dcgm
diff --git a/integration_test/third_party_apps_test/applications/nvml/centos_rhel/install b/integration_test/third_party_apps_test/applications/nvml/centos_rhel/install
@@ -79,36 +79,14 @@ try_install() {
     return 1
 }
 
-handle_rhel7() {
-    install_driver_package() {
-        # Ref: https://docs.nvidia.com/datacenter/tesla/tesla-installation-notes/index.html#centos7
-        # For Centos - we can expect the repo to have the matching version of
-        # kernel packages, and the driver package needs those kernel packages
-        sudo yum install -y kernel-devel-$(uname -r) kernel-headers-$(uname -r)
-        sudo yum -y install nvidia-driver-latest-dkms
-    }
-
-    remove_driver_package() {
-        # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
-        sudo yum -y remove "*nvidia*"
-    }
+install_driver_package() {
+    # Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
+    sudo yum -y module install nvidia-driver
 }
 
-handle_common() {
-    install_driver_package() {
-        # Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
-        sudo yum -y module install nvidia-driver
-    }
-
-    remove_driver_package() {
-        # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
-        sudo yum -y module remove --all nvidia-driver
-    }
-
+remove_driver_package() {
+    # Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
+    sudo yum -y module remove --all nvidia-driver
 }
 
-case "$VERSION_ID" in
-    7) handle_rhel7;;
-    *) handle_common;;
-esac
 try_install install_cuda_from_package_manager install_cuda_from_runfile