Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable integration test results report on Jenkins [skip ci] #4624

Merged
merged 1 commit into from
Jan 26, 2022
Merged

Enable integration test results report on Jenkins [skip ci] #4624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ else
$TEST_TYPE_PARAM
"$TEST_ARGS"
$RUN_TEST_PARAMS
--junitxml=TEST-pytest-`date +%s%N`.xml
"$@")

NUM_LOCAL_EXECS=${NUM_LOCAL_EXECS:-0}
Expand Down
66 changes: 52 additions & 14 deletions jenkins/Jenkinsfile-blossom.premerge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ def PROJECT_VER // project version retrieved from 'version-def.sh' to determine
def major_ver // major version extracted from project version
def minor_ver // minor version extracted from project version
def PREMERGE_CI_2_ARGUMENT // argument for 'spark-premerge-build.sh' running from stage of Premerge CI 2
def TestResult1 // keep ci_1 pytest result files that's in JUnit-XML style
def TestResult2 // keep ci_2 pytest result files that's in JUnit-XML style

// constant parameters for aws and azure databricks cluster
// CSP params
Expand Down Expand Up @@ -314,19 +316,24 @@ pipeline {
script {
container('gpu') {
timeout(time: 4, unit: 'HOURS') { // step only timeout for test run
sh "$PREMERGE_SCRIPT mvn_verify"
step([$class : 'JacocoPublisher',
execPattern : '**/target/jacoco.exec',
classPattern : 'target/jacoco_classes/',
sourceInclusionPattern: '**/*.java,**/*.scala',
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/'
])
try {
sh "$PREMERGE_SCRIPT mvn_verify"
step([$class : 'JacocoPublisher',
execPattern : '**/target/jacoco.exec',
classPattern : 'target/jacoco_classes/',
sourceInclusionPattern: '**/*.java,**/*.scala',
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/'
])
} finally {
// Save pytest result and publish to Jenkins at last
TestResult1 = stashPytestResult("testResult1")
}
}
}
}
Expand Down Expand Up @@ -362,7 +369,12 @@ pipeline {

container('gpu') {
timeout(time: 4, unit: 'HOURS') {
sh "$PREMERGE_SCRIPT $PREMERGE_CI_2_ARGUMENT"
try {
sh "$PREMERGE_SCRIPT $PREMERGE_CI_2_ARGUMENT"
} finally {
// Save pytest result and publish to Jenkins at last
TestResult2 = stashPytestResult("testResult2")
}
}
}
}
Expand Down Expand Up @@ -477,6 +489,21 @@ pipeline {
deleteDockerTempTag("${PREMERGE_TAG}") // clean premerge temp image
}
}

// Collect test results
if (TestResult1) {
unstash "testResult1"
}
if (TestResult2) {
unstash "testResult2"
}

// Record test results to Jenkins
if (TestResult1 || TestResult2) {
junit skipPublishingChecks: true, testResults: '**/TEST-pytest*.xml'
} else {
echo 'Skip recording test results'
}
}
}
}
Expand Down Expand Up @@ -587,3 +614,14 @@ void abortDupBuilds() {
prevBuild = prevBuild.getPreviousBuildInProgress()
}
}

String stashPytestResult(String name) {
def result = sh(returnStdout: true, script: "find . -name 'TEST-pytest*.xml' -exec ls -l {} \\;")
echo result

if (result) {
stash(name: name, includes: "**/TEST-pytest*.xml")
}

return result
}