This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new b96914b637ee [SPARK-47095][INFRA][FOLLOW-UP] Remove TTY specific
workaround in Maven build
b96914b637ee is described below
commit b96914b637ee0692f3c836c2637863704c6b73fa
Author: Hyukjin Kwon <gurwls...@apache.org>
AuthorDate: Tue Feb 20 21:42:12 2024 -0800
[SPARK-47095][INFRA][FOLLOW-UP] Remove TTY specific workaround in Maven
build
### What changes were proposed in this pull request?
This PR is a followup of https://github.com/apache/spark/pull/45171 that
broke the scheduled build of macos-14.
Here I remove TTY specific workaround in Maven build, and skips
`AmmoniteTest` that needs the workaround.
We should enable the tests back when the bug is fixed (see
https://github.com/apache/spark/pull/40675#issuecomment-1513102087)
### Why are the changes needed?
To fix up the build, It fails
https://github.com/apache/spark/actions/runs/7979285164
See also https://github.com/apache/spark/pull/45186#discussion_r1496839930
### Does this PR introduce _any_ user-facing change?
No, test-only.
### How was this patch tested?
In my fork.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #45186 from HyukjinKwon/SPARK-47095-followup.
Lead-authored-by: Hyukjin Kwon <gurwls...@apache.org>
Co-authored-by: Hyukjin Kwon <gurwls...@gmail.com>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
.github/workflows/maven_test.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/maven_test.yml b/.github/workflows/maven_test.yml
index 80898b3a507a..d63066a521f9 100644
--- a/.github/workflows/maven_test.yml
+++ b/.github/workflows/maven_test.yml
@@ -73,13 +73,19 @@ jobs:
connector#kafka-0-10,connector#kafka-0-10-sql,connector#kafka-0-10-token-provider,connector#spark-ganglia-lgpl,connector#protobuf,connector#avro
- >-
sql#api,sql#catalyst,resource-managers#yarn,resource-managers#kubernetes#core
- - >-
- connect
# Here, we split Hive and SQL tests into some of slow ones and the
rest of them.
included-tags: [ "" ]
excluded-tags: [ "" ]
comment: [ "" ]
include:
+ # Connect tests
+ - modules: connect
+ java: ${{ inputs.java }}
+ hadoop: ${{ inputs.hadoop }}
+ hive: hive2.3
+ # TODO(SPARK-47110): Reenble AmmoniteTest tests in Maven builds
+ excluded-tags: org.apache.spark.tags.AmmoniteTest
+ comment: ""
# Hive tests
- modules: sql#hive
java: ${{ inputs.java }}
@@ -178,13 +184,7 @@ jobs:
# Run the tests.
- name: Run tests
env: ${{ fromJSON(inputs.envs) }}
- # The command script takes different options ubuntu vs macos-14, see
also SPARK-47095.
- shell: '[[ "${{ inputs.os }}" == *"ubuntu"* ]] && script -q -e -c
"bash {0}" || script -q -e "bash {0}"'
run: |
- # Fix for TTY related issues when launching the Ammonite REPL in
tests.
- export TERM=vt100
- # `set -e` to make the exit status as expected due to use `script -q
-e -c` to run the commands
- set -e
export MAVEN_OPTS="-Xss64m -Xmx4g -Xms4g
-XX:ReservedCodeCacheSize=128m -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN"
export MAVEN_CLI_OPTS="--no-transfer-progress"
export JAVA_VERSION=${{ matrix.java }}
@@ -193,10 +193,10 @@ jobs:
./build/mvn $MAVEN_CLI_OPTS -DskipTests -Pyarn -Pkubernetes
-Pvolcano -Phive -Phive-thriftserver -Phadoop-cloud -Pspark-ganglia-lgpl
-Djava.version=${JAVA_VERSION/-ea} clean install
if [[ "$INCLUDED_TAGS" != "" ]]; then
./build/mvn $MAVEN_CLI_OPTS -pl "$TEST_MODULES" -Pyarn
-Pkubernetes -Pvolcano -Phive -Phive-thriftserver -Phadoop-cloud
-Pspark-ganglia-lgpl -Djava.version=${JAVA_VERSION/-ea}
-Dtest.include.tags="$INCLUDED_TAGS" test -fae
+ elif [[ "$MODULES_TO_TEST" == "connect" ]]; then
+ ./build/mvn $MAVEN_CLI_OPTS -Dtest.exclude.tags="$EXCLUDED_TAGS"
-Djava.version=${JAVA_VERSION/-ea} -pl
connector/connect/client/jvm,connector/connect/common,connector/connect/server
test -fae
elif [[ "$EXCLUDED_TAGS" != "" ]]; then
./build/mvn $MAVEN_CLI_OPTS -pl "$TEST_MODULES" -Pyarn
-Pkubernetes -Pvolcano -Phive -Phive-thriftserver -Phadoop-cloud
-Pspark-ganglia-lgpl -Djava.version=${JAVA_VERSION/-ea}
-Dtest.exclude.tags="$EXCLUDED_TAGS" test -fae
- elif [[ "$MODULES_TO_TEST" == "connect" ]]; then
- ./build/mvn $MAVEN_CLI_OPTS -Djava.version=${JAVA_VERSION/-ea} -pl
connector/connect/client/jvm,connector/connect/common,connector/connect/server
test -fae
elif [[ "$MODULES_TO_TEST" == *"sql#hive-thriftserver"* ]]; then
# To avoid a compilation loop, for the `sql/hive-thriftserver`
module, run `clean install` instead
./build/mvn $MAVEN_CLI_OPTS -pl "$TEST_MODULES" -Pyarn
-Pkubernetes -Pvolcano -Phive -Phive-thriftserver -Phadoop-cloud
-Pspark-ganglia-lgpl -Djava.version=${JAVA_VERSION/-ea} clean install -fae
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
