Skip to content

Commit

Permalink
GH-44980: [CI] Remove retrieval of Arrow version from Java on Spark i…
Browse files Browse the repository at this point in the history
…ntegration and update test structure for PySpark (#44981)

### Rationale for this change

The job is currently failing.

### What changes are included in this PR?

Remove unnecessary check on Java code and refactor pyspark test modules to follow new test structure: apache/spark#49104

### Are these changes tested?

Via archery

### Are there any user-facing changes?

No
* GitHub Issue: #44980

Authored-by: Raúl Cumplido <[email protected]>
Signed-off-by: Raúl Cumplido <[email protected]>
  • Loading branch information
raulcd authored Dec 11, 2024
1 parent e8a85dc commit 5db2843
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ci/scripts/integration_spark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ if [ "${SPARK_VERSION:1:2}" == "2." ]; then
export ARROW_PRE_0_15_IPC_FORMAT=1
fi

# Get Arrow Java version
pushd ${source_dir}/java
arrow_version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }'`
popd

export MAVEN_OPTS="-Xss256m -Xmx2g -XX:ReservedCodeCacheSize=1g -Dorg.slf4j.simpleLogger.defaultLogLevel=warn"
export MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"

Expand All @@ -47,8 +42,13 @@ pushd ${spark_dir}
build/mvn -B -DskipTests package

# Run pyarrow related Python tests only
# "pyspark.sql.tests.arrow.test_arrow_grouped_map" and
# "pyspark.sql.tests.arrow.test_arrow_cogrouped_map" currently fail.
# See: https://github.com/apache/arrow/issues/44986
spark_python_tests=(
"pyspark.sql.tests.test_arrow")
"pyspark.sql.tests.arrow.test_arrow"
"pyspark.sql.tests.arrow.test_arrow_map"
"pyspark.sql.tests.arrow.test_arrow_python_udf")

case "${SPARK_VERSION}" in
v1.*|v2.*|v3.0.*|v3.1.*|v3.2.*|v3.3.*)
Expand Down

0 comments on commit 5db2843

Please sign in to comment.