Skip to content
Closed
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
1 change: 1 addition & 0 deletions integration_tests/run_pyspark_from_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ else
$TEST_TYPE_PARAM
"$TEST_ARGS"
$RUN_TEST_PARAMS
--junitxml=TEST-pytest.xml
"$@")

NUM_LOCAL_EXECS=${NUM_LOCAL_EXECS:-0}
Expand Down
26 changes: 26 additions & 0 deletions jenkins/Jenkinsfile-blossom.premerge
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ pipeline {
sourcePattern : 'shuffle-plugin/src/main/scala/,udf-compiler/src/main/scala/,sql-plugin/src/main/java/,sql-plugin/src/main/scala/,shims/spark311/src/main/scala/,shims/spark301db/src/main/scala/,shims/spark301/src/main/scala/,shims/spark302/src/main/scala/,shims/spark303/src/main/scala/,shims/spark304/src/main/scala/,shims/spark312/src/main/scala/,shims/spark313/src/main/scala/',
sourceInclusionPattern: '**/*.java,**/*.scala'
])
stash(name: "test_result_mvn_verify", includes: "**/target/*/TEST-*.xml")

}
}
}
Expand Down Expand Up @@ -213,13 +215,37 @@ pipeline {
container('gpu') {
timeout(time: 4, unit: 'HOURS') {
sh "$PREMERGE_SCRIPT unit_test"
stash(name: "test_result_unit_test", includes: "**/target/*/TEST-*.xml")
}
}
}
}
} // end of Unit Test stage
} // end of parallel
} // end of Premerge Test

stage('Collect Test Result') {
when {
expression {
!skipped
}
}

steps {
dir('mvn_verify') {
unstash "test_result_mvn_verify"
}

dir('unit_test') {
unstash "test_result_unit_test"
}

step([$class : 'JUnitResultArchiver',
testResults : '**/target/*/TEST-*.xml',
skipPublishingChecks : true
])
}
} // Collect Test Result
} // end of stages

post {
Expand Down
7 changes: 7 additions & 0 deletions jenkins/spark-premerge-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ MVN_GET_CMD="mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -B \

rm -rf $ARTF_ROOT && mkdir -p $ARTF_ROOT

# If possible create '~/.m2' cache from pre-created m2 tarball to minimize the impact of unstable network connection.
# Please refer to job 'update_premerge_m2_cache' on Blossom about building m2 tarball details.
M2_CACHE_TAR=${M2_CACHE_TAR:-"/home/jenkins/agent/m2_cache/premerge_m2_cache.tar"}
if [ -s "$M2_CACHE_TAR" ] ; then
tar xvf $M2_CACHE_TAR -C ~/
fi

# Download a full version of spark
$MVN_GET_CMD \
-DgroupId=org.apache -DartifactId=spark -Dversion=$SPARK_VER -Dclassifier=bin-hadoop3.2 -Dpackaging=tgz
Expand Down