Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions .github/workflows/tpcds-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,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 }}
Expand Down Expand Up @@ -254,14 +257,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
Expand All @@ -284,6 +283,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 != '' }}
Expand Down Expand Up @@ -386,7 +392,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 \
Expand All @@ -412,4 +417,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 ./
ls -la ./

2 changes: 1 addition & 1 deletion dev/auron-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dev/auron-it/run-it.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading