Skip to content

[ci] Fix Jenkinsfile to use the json files for pipeline benchmarks reporting #8346

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

Merged
merged 2 commits into from
Nov 3, 2023
Merged

[ci] Fix Jenkinsfile to use the json files for pipeline benchmarks reporting #8346

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aa33f2
Fix Jenkinsfile to use the json files for pipeline benchmarks reporting
marc-gr Oct 31, 2023
1ab3842
Change extension in stashBenchmarkResults
marc-gr Oct 31, 2023
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
6 changes: 3 additions & 3 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ def gitHubCommentWithBenchmarkReport() {
}
dir("${BASE_DIR}") {
// download artifacts for this PR
def bucketUri = getBenchmarkBucketURI() + "*.xml"
def bucketUri = getBenchmarkBucketURI() + "*.json"
log(level: 'INFO', text: "googleStorageDownload(bucketUri: ${bucketUri}, localDirectory: ${currentBenchmarkResults}, pathPrefix: ${getBenchmarkPathPrefix()})")
googleStorageDownload(bucketUri: bucketUri, credentialsId: "${JOB_GCS_CREDENTIALS}", localDirectory: currentBenchmarkResults, pathPrefix: getBenchmarkPathPrefix())

// download artifacts from the target branch if any
if (env.CHANGE_TARGET) {
try {
copyArtifacts(filter: "${currentBenchmarkResults}/*.xml", flatten: true, optional: true, projectName: getBaselineJobName(), selector: lastWithArtifacts(), target: baseline)
copyArtifacts(filter: "${currentBenchmarkResults}/*.json", flatten: true, optional: true, projectName: getBaselineJobName(), selector: lastWithArtifacts(), target: baseline)
} catch(e) {
log(level: 'INFO', text: 'gitHubCommentWithBenchmarkReport: it was not possible to copy the previous build.')
return
Expand Down Expand Up @@ -398,7 +398,7 @@ def prepareStack() {
}

def stashBenchmarkResults() {
def wildcard = 'build/benchmark-results/*.xml'
def wildcard = 'build/benchmark-results/*.json'
r = sh(label: "isBenchmarkResultsPresent", script: "ls ${wildcard}", returnStatus: true)
if (r != 0) {
echo "isBenchmarkResultsPresent: benchmark files not found, report won't be stashed"
Expand Down