Skip to content

Commit

Permalink
Revert "Fix the mismatching default configs in integration tests (NVI…
Browse files Browse the repository at this point in the history
…DIA#11283)"

This reverts commit bc8c577.

Signed-off-by: Jihoon Son <ghoonson@gmail.com>
  • Loading branch information
jihoonson committed Aug 16, 2024
1 parent 5302651 commit 16729e4
Show file tree
Hide file tree
Showing 17 changed files with 85 additions and 343 deletions.
5 changes: 1 addition & 4 deletions integration_tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2024, NVIDIA CORPORATION.
# Copyright (c) 2020-2023, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -62,6 +62,3 @@ def pytest_addoption(parser):
parser.addoption(
"--pyarrow_test", action='store_true', default=False, help="if enable pyarrow tests"
)
parser.addoption(
"--default_configs_path", action="store", default=None, help="path to a JSON file that stores default configs for integration test"
)
37 changes: 1 addition & 36 deletions integration_tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,6 @@
<!-- for hive udf test cases -->
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive_${scala.binary.version}</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.scopt/scopt -->
<dependency>
Expand All @@ -88,31 +78,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>populate-default-configs-for-testing</id>
<phase>generate-test-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
<java classname="com.nvidia.spark.rapids.tests.DumpDefaultConfigs"
failonerror="true"
classpathref="maven.compile.classpath"
fork="true">
<arg value="json"/>
<arg value="${project.build.directory}/spark-rapids-default-configs.json"/>
</java>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
Expand Down Expand Up @@ -216,7 +181,7 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>run-pyspark-tests</id>
<id>run pyspark tests</id>
<phase>verify</phase><!--run after packageing and collecting dependencies-->
<goals>
<goal>exec</goal>
Expand Down
2 changes: 0 additions & 2 deletions integration_tests/run_pyspark_from_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ else

REPORT_CHARS=${REPORT_CHARS:="fE"} # default as (f)ailed, (E)rror
STD_INPUT_PATH="$INPUT_PATH"/src/test/resources
DEFAULT_CONFIGS_PATH=${DEFAULT_CONFIGS_PATH:-${TARGET_DIR}/spark-rapids-default-configs.json}
TEST_COMMON_OPTS=(-v
-r"$REPORT_CHARS"
"$TEST_TAGS"
Expand All @@ -233,7 +232,6 @@ else
"$TEST_ARGS"
$RUN_TEST_PARAMS
--junitxml=TEST-pytest-`date +%s%N`.xml
--default_configs_path="${DEFAULT_CONFIGS_PATH}"
"$@")

NUM_LOCAL_EXECS=${NUM_LOCAL_EXECS:-0}
Expand Down
6 changes: 1 addition & 5 deletions integration_tests/src/assembly/bin.xml