Rebalance testing load [databricks] (#4215)

* Rebalance testing load Signed-off-by: Peixin Li <pxli@nyu.edu> * move udf_test to ci_2
NVIDIA · Nov 26, 2021 · f2c9176 · f2c9176
1 parent 53d89e6
commit f2c9176
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/integration_tests/src/main/python/qa_nightly_select_test.py b/integration_tests/src/main/python/qa_nightly_select_test.py
@@ -26,9 +26,6 @@
 from marks import approximate_float, ignore_order, incompat, qarun
 from data_gen import copy_and_update
 
-# Mark all tests in current file as premerge_ci_1 in order to be run in first k8s pod for parallel build premerge job
-pytestmark = pytest.mark.premerge_ci_1
-
 def num_stringDf(spark):
     print("### CREATE DATAFRAME 1  ####")
     schema = StructType([StructField("strF", StringType()),

diff --git a/integration_tests/src/main/python/udf_test.py b/integration_tests/src/main/python/udf_test.py
@@ -40,9 +40,6 @@
 import pandas as pd
 from typing import Iterator, Tuple
 
-# Mark all tests in current file as premerge_ci_1 in order to be run in first k8s pod for parallel build premerge job
-pytestmark = pytest.mark.premerge_ci_1
-
 arrow_udf_conf = {
     'spark.sql.execution.arrow.pyspark.enabled': 'true',
     'spark.rapids.sql.exec.WindowInPandasExec': 'true',

diff --git a/jenkins/databricks/test.sh b/jenkins/databricks/test.sh
@@ -28,7 +28,7 @@ if [ -d "/databricks/conda/envs/cudf-udf" ]; then
     export PYSPARK_PYTHON=/databricks/conda/envs/cudf-udf/bin/python
 fi
 # Try to use the pip from the conda environment if it is available
-sudo "$(which pip)" install pytest sre_yield requests pandas pyarrow findspark pytest-xdist pytest-ordering
+sudo "$(which pip)" install pytest sre_yield requests pandas pyarrow findspark pytest-xdist pytest-order
 
 export SPARK_HOME=/databricks/spark
 # change to not point at databricks confs so we don't conflict with their settings