This is an automated email from the ASF dual-hosted git repository.
richox pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/auron.git
The following commit(s) were added to refs/heads/master by this push:
new 29766fa0 [AURON #1769][CI] Improve auron-it build (#1932)
29766fa0 is described below
commit 29766fa0e1881b074ce7e5fab7fec6870298ecd8
Author: yew1eb <[email protected]>
AuthorDate: Wed Jan 28 00:03:37 2026 +0800
[AURON #1769][CI] Improve auron-it build (#1932)
<!--
- Start the PR title with the related issue ID, e.g. '[AURON #XXXX]
Short summary...'.
-->
# Which issue does this PR close?
Closes #1802
# Rationale for this change
# What changes are included in this PR?
# Are there any user-facing changes?
# How was this patch tested?
---
.github/workflows/tpcds-reusable.yml | 34 ++++++++++++++++++++--------------
dev/auron-it/pom.xml | 2 +-
dev/auron-it/run-it.sh | 2 +-
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/tpcds-reusable.yml
b/.github/workflows/tpcds-reusable.yml
index 7950326e..75f82ae3 100644
--- a/.github/workflows/tpcds-reusable.yml
+++ b/.github/workflows/tpcds-reusable.yml
@@ -182,14 +182,17 @@ jobs:
}}${{ inputs.unifflever && format('-{0}', inputs.unifflever) || ''
}}
path: target/auron-${{ inputs.sparkver }}_${{ inputs.scalaver
}}-pre-*.jar
overwrite: true
- - name: Upload auron maven artifacts (Spark ${{ inputs.sparkver }},
Scala ${{ inputs.scalaver }}, JDK ${{ inputs.javaver }})
+
+ - name: Build auron-it (Spark ${{ inputs.sparkver }}, Scala ${{
inputs.scalaver }}, JDK ${{ inputs.javaver }})
+ run: |
+ cd dev/auron-it
+ ${{ github.workspace }}/build/mvn package -P${{ inputs.sparkver }}
-Pscala-${{ inputs.scalaver }}
+ - name: Upload auron it (Spark ${{ inputs.sparkver }}, Scala ${{
inputs.scalaver }}, JDK ${{ inputs.javaver }})
uses: actions/upload-artifact@v6
with:
- name: auron-artifacts-${{ inputs.sparkver }}_${{ inputs.scalaver
}}-jdk-${{ inputs.javaver
- }}${{ inputs.celebornver && format('-{0}', inputs.celebornver) ||
''
- }}${{ inputs.unifflever && format('-{0}', inputs.unifflever) || ''
}}
- path: ~/.m2/repository/org/apache/auron
- if-no-files-found: error
+ name: auron-it-${{ inputs.sparkver }}_${{ inputs.scalaver }}-jdk-${{
inputs.javaver }}
+ path: dev/auron-it/target/auron-it-${{ inputs.sparkver }}_${{
inputs.scalaver }}*-jar-with-dependencies.jar
+ overwrite: true
run-tpcds-test:
name: Run TPC-DS test ${{ matrix.query }}
@@ -253,14 +256,10 @@ jobs:
}}${{ inputs.celebornver && format('-{0}', inputs.celebornver) ||
''
}}${{ inputs.unifflever && format('-{0}', inputs.unifflever) || ''
}}
- - name: Download auron maven artifacts
+ - name: Download auron-it JAR
uses: actions/download-artifact@v7
with:
- name: >
- auron-artifacts-${{ inputs.sparkver }}_${{ inputs.scalaver
}}-jdk-${{ inputs.javaver
- }}${{ inputs.celebornver && format('-{0}', inputs.celebornver) ||
''
- }}${{ inputs.unifflever && format('-{0}', inputs.unifflever) || ''
}}
- path: ~/.m2/repository/org/apache/auron
+ name: auron-it-${{ inputs.sparkver }}_${{ inputs.scalaver }}-jdk-${{
inputs.javaver }}
- name: Checkout TPC-DS Data
uses: actions/checkout@v6
@@ -283,6 +282,13 @@ jobs:
java-version: ${{ inputs.javaver }}
cache: 'maven'
+ - name: Install auron-it JAR
+ run: |
+ ls -la
+ jar=$(ls -1 auron-it-*-jar-with-dependencies.jar | head -n1)
+ [ -n "$jar" ] || { echo "No jar matched:
auron-it-*-jar-with-dependencies.jar"; exit 1; }
+ echo "AURON_IT_JAR=$jar" >> "$GITHUB_ENV"
+
- name: Cache Celeborn-${{
steps.get-dependency-version.outputs.celebornversion }}
uses: actions/cache@v5
if: ${{ inputs.celebornver != '' }}
@@ -385,7 +391,6 @@ jobs:
SPARK_HOME: spark-bin-${{ inputs.sparkver }}_${{ inputs.scalaver }}
run: |
ls -la
- ls -la ~/.m2/repository/org/apache/auron
dev/auron-it/run-it.sh \
${{ inputs.extrasparkconf }} \
--type tpcds \
@@ -411,4 +416,5 @@ jobs:
rm -f auron-*${{ inputs.sparkver }}_${{ inputs.scalaver }}*.jar
rm -f celeborn-client-spark-*_${{ inputs.scalaver }}-*.jar
rm -f rss-client-spark*.jar
- ls -la ./
\ No newline at end of file
+ ls -la ./
+
diff --git a/dev/auron-it/pom.xml b/dev/auron-it/pom.xml
index 1360697f..5cdd1710 100644
--- a/dev/auron-it/pom.xml
+++ b/dev/auron-it/pom.xml
@@ -24,7 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>auron-it</artifactId>
+ <artifactId>auron-it-${shimName}_${scalaVersion}</artifactId>
<packaging>jar</packaging>
<name>Apache Auron Integration Tests</name>
<description>Apache Auron Integration Tests Project</description>
diff --git a/dev/auron-it/run-it.sh b/dev/auron-it/run-it.sh
index b202d698..014d24ed 100755
--- a/dev/auron-it/run-it.sh
+++ b/dev/auron-it/run-it.sh
@@ -32,7 +32,7 @@ PROFILES="-P${SPARK_VERSION},scala-${SCALA_VERSION}"
PROJECT_VERSION="$("${MVN_CMD}" -f "${AURON_DIR}/pom.xml" -q ${PROFILES}
help:evaluate -Dexpression=project.version -DforceStdout)"
AURON_SPARK_JAR="${AURON_SPARK_JAR:-${AURON_DIR}/dev/mvn-build-helper/assembly/target/auron-${SPARK_VERSION}_${SCALA_VERSION}-${PROJECT_VERSION}.jar}"
-AURON_IT_JAR="${AURON_DIR}/dev/auron-it/target/auron-it-${PROJECT_VERSION}-jar-with-dependencies.jar"
+AURON_IT_JAR="${AURON_IT_JAR:-${AURON_DIR}/dev/auron-it/target/auron-it-${SPARK_VERSION}_${SCALA_VERSION}-${PROJECT_VERSION}-jar-with-dependencies.jar}"
if [[ -z "${SPARK_HOME:-}" ]]; then
