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

[CI] runbld project name #20466

Merged
merged 4 commits into from
Aug 11, 2020
Merged

[CI] runbld project name #20466

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16e670a
[CI] runbld project name
v1v Aug 6, 2020
4f01c82
[CI] force cwd
v1v Aug 6, 2020
e068990
fixes The most common cause is that Jenkins and runbld are configured…
v1v Aug 6, 2020
2efc57d
Tests need to be stored in the workspace
v1v Aug 6, 2020
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
19 changes: 10 additions & 9 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,23 +1422,24 @@ def junitAndStore(Map params = [:]){
def runbld() {
catchError(buildResult: 'SUCCESS', message: 'runbld post build action failed.') {
if (stashedTestReports) {
def jobName = isPR() ? 'elastic+beats+pull-request' : 'elastic+beats'
deleteDir()
unstashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
dir("${env.BASE_DIR}") {
sh(label: 'Prepare workspace context',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this just being replaced by the deleteDir() on L1426?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, good catch as I didn't explain it. Using the same prepare context as we do normally with L1426-L1427. It was easier than doing the weird find/delete script :)

script: 'find . -type f -name "TEST*.xml" -path "*/build/*" -delete')
// Unstash the test reports
stashedTestReports.each { k, v ->
dir(k) {
unstash(v)
}
}
sh(label: 'Process JUnit reports with runbld',
script: '''\
cat >./runbld-script <<EOF
echo "Processing JUnit reports with runbld..."
EOF
/usr/local/bin/runbld ./runbld-script
'''.stripIndent()) // stripIdent() requires '''/
}
sh(label: 'Process JUnit reports with runbld',
script: """\
cat >./runbld-script <<EOF
echo "Processing JUnit reports with runbld..."
EOF
/usr/local/bin/runbld ./runbld-script --job-name ${jobName}
""".stripIndent()) // stripIdent() requires '''/
}
}
}