From 595f0193d6fd3e70ee57717901b5a28aa78b4dbc Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 2 Mar 2021 14:03:41 -0700 Subject: [PATCH] revert changes to Jenkinsfile --- Jenkinsfile | 47 +++++++++-------------------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 672f5127a9796..8ab3fecb07a1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,48 +3,19 @@ library 'kibana-pipeline-library' kibanaLibrary.load() -kibanaPipeline(timeoutMinutes: 210) { - githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') { - ciStats.trackBuild { - catchErrors { - slackNotifications.onFailure( - title: "*<${env.BUILD_URL}|[${params.branch}] Baseline Capture Failure>*", - message: "[${params.branch}/${params.commit}] Baseline Capture Failure", - ) { - retryable.enable(2) - - catchErrors { - workers.ci( - name: 'baseline-worker', - size: 'xl', - ramDisk: true, - runErrorReporter: false, - bootstrapped: false - ) { - withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') { - withEnv([ - 'BUILD_TS_REFS_CACHE_ENABLE=true', - 'BUILD_TS_REFS_CACHE_CAPTURE=true', - 'DISABLE_BOOTSTRAP_VALIDATIONS=true', - ]) { - kibanaPipeline.doSetup() - } - } - - kibanaPipeline.withCiTaskQueue([parallel: 2]) { - catchErrors { - tasks([ - kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'), - kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'), - ]) - } - } - } - } +kibanaPipeline(timeoutMinutes: 210, checkPrChanges: true, setCommitStatus: true) { + slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) { + githubPr.withDefaultPrComments { + ciStats.trackBuild { + catchError { + retryable.enable() + kibanaPipeline.allCiTasks() } } } + } + if (params.NOTIFY_ON_FAILURE) { kibanaPipeline.sendMail() } }