[spark-rapids] Updating spark-rapids version to 24.08.1 and enabling …

…the tests to run only for 2.1 and 2.2 images (#1232)

* [spark-rapids] Updating spark-rapid version and enabling the tests to run only for 2.1 and 2.2 images

* modifying the ignore statement

spark-rapids/spark-rapids.sh

@@ -216,7 +216,7 @@ else
 fi
 
 # Update SPARK RAPIDS config
-readonly DEFAULT_SPARK_RAPIDS_VERSION="24.06.0"
+readonly DEFAULT_SPARK_RAPIDS_VERSION="24.08.1"
 readonly SPARK_RAPIDS_VERSION=$(get_metadata_attribute 'spark-rapids-version' ${DEFAULT_SPARK_RAPIDS_VERSION})
 readonly XGBOOST_VERSION=$(get_metadata_attribute 'xgboost-version' ${DEFAULT_XGBOOST_VERSION})
 

spark-rapids/test_spark_rapids.py

@@ -61,17 +61,8 @@ def test_spark_rapids(self, configuration, machine_suffixes, accelerator):
     if self.getImageOs() == "rocky":
       self.skipTest("Not supported for Rocky OS")
 
-    if self.getImageVersion() < pkg_resources.parse_version("2.0"):
-      self.skipTest("Not supported in pre 2.0 images")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.0") and self.getImageOs() == "ubuntu":
-      self.skipTest("Not supported in image 2.0 for ubuntu")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.1"):
-      self.skipTest("Not supported in image 2.1 because of secure boot")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.2"):
-      self.skipTest("Not supported in image 2.2 because of secure boot")
+    if self.getImageVersion() <= pkg_resources.parse_version("2.0"):
+      self.skipTest("Not supported in 2.0 and earlier images")
 
     optional_components = None
     metadata = "gpu-driver-provider=NVIDIA,rapids-runtime=SPARK"
@@ -100,17 +91,8 @@ def test_spark_rapids_sql(self, configuration, machine_suffixes, accelerator):
     if self.getImageOs() == "rocky":
       self.skipTest("Not supported for Rocky OS")
 
-    if self.getImageVersion() < pkg_resources.parse_version("2.0"):
-      self.skipTest("Not supported in pre 2.0 images")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.0") and self.getImageOs() == "ubuntu":
-      self.skipTest("Not supported in image 2.0 for ubuntu")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.1"):
-      self.skipTest("Not supported in image 2.1 because of secure boot")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.2"):
-      self.skipTest("Not supported in image 2.2 because of secure boot")
+    if self.getImageVersion() <= pkg_resources.parse_version("2.0"):
+      self.skipTest("Not supported in 2.0 and earlier images")
 
     optional_components = None
     metadata = "gpu-driver-provider=NVIDIA,rapids-runtime=SPARK"
@@ -139,17 +121,8 @@ def test_non_default_cuda_versions(self, configuration, machine_suffixes,
     if self.getImageOs() == "rocky":
       self.skipTest("Not supported for Rocky OS")
 
-    if self.getImageVersion() < pkg_resources.parse_version("2.0"):
-      self.skipTest("Not supported in pre 2.0 images")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.0") and self.getImageOs() == "ubuntu":
-      self.skipTest("Not supported in image 2.0 for ubuntu")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.1"):
-      self.skipTest("Not supported in image 2.1 because of secure boot")
-
-    if self.getImageVersion() == pkg_resources.parse_version("2.2"):
-      self.skipTest("Not supported in image 2.2 because of secure boot")
+    if self.getImageVersion() <= pkg_resources.parse_version("2.0"):
+      self.skipTest("Not supported in 2.0 and earlier images")
 
     metadata = ("gpu-driver-provider=NVIDIA,rapids-runtime=SPARK"
                 ",cuda-version={0},driver-version={1}".format(cuda_version, driver_version))