Reduce time-consuming of pre-merge

dist/pom.xml

@@ -216,6 +216,9 @@
         </profile>
         <profile>
             <id>pre-merge</id>
+            <properties>
+                <included_buildvers>${buildver}</included_buildvers>
+            </properties>
             <build>
                 <plugins>
                     <plugin>

integration_tests/src/main/python/conditionals_test.py

@@ -21,6 +21,9 @@
 from marks import datagen_overrides, allow_non_gpu
 import pyspark.sql.functions as f
 
+# mark this test as ci_1 for mvn verify sanity check in pre-merge CI
+pytestmark = pytest.mark.premerge_ci_1
+
 def mk_str_gen(pattern):
     return StringGen(pattern).with_special_case('').with_special_pattern('.{0,10}')
 

integration_tests/src/main/python/sort_test.py

@@ -22,6 +22,9 @@
 import pyspark.sql.functions as f
 from spark_session import is_before_spark_340
 
+# mark this test as ci_1 for mvn verify sanity check in pre-merge CI
+pytestmark = pytest.mark.premerge_ci_1
+
 # Many Spark versions have issues sorting decimals.
 # https://issues.apache.org/jira/browse/SPARK-40089
 _orderable_not_null_big_decimal_gen = DecimalGen(precision=20, scale=2, nullable=False)

jenkins/spark-premerge-build.sh

@@ -59,9 +59,10 @@ mvn_verify() {
               $MVN_CMD -B $MVN_URM_MIRROR -Dbuildver=$version test -rf tests $MVN_BUILD_ARGS -Dpytest.TEST_TAGS='' \
               -DwildcardSuites=org.apache.spark.sql.rapids.filecache.FileCacheIntegrationSuite
         # build only for other versions
-        elif [[ "${SPARK_SHIM_VERSIONS_NOSNAPSHOTS_TAIL[@]}" =~ "$version" ]]; then
-            $MVN_INSTALL_CMD -DskipTests -Dbuildver=$version
+        # elif [[ "${SPARK_SHIM_VERSIONS_NOSNAPSHOTS_TAIL[@]}" =~ "$version" ]]; then
+        #     $MVN_INSTALL_CMD -DskipTests -Dbuildver=$version
         fi
+        $MVN_INSTALL_CMD -DskipTests -Dbuildver=$SPARK_BASE_SHIM_VERSION
     done
 
     # enable UTF-8 for regular expression tests
@@ -239,7 +240,7 @@ nvidia-smi
 
 . jenkins/version-def.sh
 
-PREMERGE_PROFILES="-PnoSnapshots,pre-merge"
+PREMERGE_PROFILES="-Ppre-merge"
 
 # If possible create '~/.m2' cache from pre-created m2 tarball to minimize the impact of unstable network connection.
 # Please refer to job 'update_premerge_m2_cache' on Blossom about building m2 tarball details.

scala2.13/dist/pom.xml

@@ -216,6 +216,9 @@
         </profile>
         <profile>
             <id>pre-merge</id>
+            <properties>
+                <included_buildvers>${buildver}</included_buildvers>
+            </properties>
             <build>
                 <plugins>
                     <plugin>