From ded15c06baec31eb9acda4e12ef013fe8c019f22 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 8 Jun 2020 12:52:07 -0700 Subject: [PATCH 1/3] include ci-stats metrics in pr comment --- Jenkinsfile | 78 ++++++++++++++++++++++---------------------- vars/githubPr.groovy | 1 + 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b6a36c79f877d..daa9be7b89ec7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,62 +1,62 @@ #!/bin/groovy -library 'kibana-pipeline-library' +library 'kibana-pipeline-library@implement/ci-stats/get-metrics-report' kibanaLibrary.load() kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) { - ciStats.trackBuild { - githubPr.withDefaultPrComments { + githubPr.withDefaultPrComments { + ciStats.trackBuild { catchError { retryable.enable() parallel([ - 'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'), - 'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'), + // 'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'), + // 'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'), 'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [ - 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'), + // 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'), 'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1), - 'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2), - 'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3), - 'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4), - 'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5), - 'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6), - 'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7), - 'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8), - 'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9), - 'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10), - 'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11), - 'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12), - 'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'), + // 'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2), + // 'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3), + // 'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4), + // 'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5), + // 'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6), + // 'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7), + // 'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8), + // 'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9), + // 'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10), + // 'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11), + // 'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12), + // 'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'), // 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'), ]), 'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [ - 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'), - 'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1), - 'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2), - 'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3), - 'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4), - 'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5), - 'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6), - 'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7), - 'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8), - 'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9), - 'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10), - 'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'), + // 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'), + // 'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1), + // 'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2), + // 'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3), + // 'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4), + // 'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5), + // 'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6), + // 'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7), + // 'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8), + // 'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9), + // 'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10), + // 'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'), 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'), - 'xpack-securitySolutionCypress': { processNumber -> - whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) { - kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber) - } - }, + // 'xpack-securitySolutionCypress': { processNumber -> + // whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) { + // kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber) + // } + // }, // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'), ]), ]) } } + } - if (params.NOTIFY_ON_FAILURE) { - slackNotifications.onFailure() - kibanaPipeline.sendMail() - } + if (params.NOTIFY_ON_FAILURE) { + slackNotifications.onFailure() + kibanaPipeline.sendMail() } } diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy index 965fb1d4e108e..9dad2f88de2ec 100644 --- a/vars/githubPr.groovy +++ b/vars/githubPr.groovy @@ -186,6 +186,7 @@ def getNextCommentMessage(previousCommentInfo = [:]) { } messages << getTestFailuresMessage() + messages << ciStats.getMetricsReport() if (info.builds && info.builds.size() > 0) { messages << getHistoryText(info.builds) From fb4485562754bf7fcaba307372c0f84c2d746f59 Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 9 Jun 2020 18:55:14 -0700 Subject: [PATCH 2/3] add a module/change asset size for testing --- src/plugins/telemetry/public/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/telemetry/public/index.ts b/src/plugins/telemetry/public/index.ts index 665c89ba2bffa..3ad7fdd16c895 100644 --- a/src/plugins/telemetry/public/index.ts +++ b/src/plugins/telemetry/public/index.ts @@ -17,10 +17,13 @@ * under the License. */ +import { inspect } from 'util'; import { PluginInitializerContext } from 'kibana/public'; import { TelemetryPlugin, TelemetryPluginConfig } from './plugin'; export { TelemetryPluginStart, TelemetryPluginSetup } from './plugin'; export function plugin(initializerContext: PluginInitializerContext) { + // eslint-disable-next-line + console.log(inspect('test')); return new TelemetryPlugin(initializerContext); } From d0cd76aea39202bddf2401a939dcd73023fbd5d3 Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 9 Jun 2020 19:42:18 -0700 Subject: [PATCH 3/3] remove test-related changes --- Jenkinsfile | 66 +++++++++++++-------------- src/plugins/telemetry/public/index.ts | 3 -- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index daa9be7b89ec7..763ee95ddde99 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ #!/bin/groovy -library 'kibana-pipeline-library@implement/ci-stats/get-metrics-report' +library 'kibana-pipeline-library' kibanaLibrary.load() kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) { @@ -9,44 +9,44 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) { catchError { retryable.enable() parallel([ - // 'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'), - // 'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'), + 'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'), + 'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'), 'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [ - // 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'), + 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'), 'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1), - // 'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2), - // 'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3), - // 'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4), - // 'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5), - // 'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6), - // 'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7), - // 'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8), - // 'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9), - // 'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10), - // 'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11), - // 'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12), - // 'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'), + 'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2), + 'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3), + 'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4), + 'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5), + 'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6), + 'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7), + 'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8), + 'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9), + 'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10), + 'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11), + 'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12), + 'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'), // 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'), ]), 'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [ - // 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'), - // 'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1), - // 'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2), - // 'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3), - // 'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4), - // 'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5), - // 'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6), - // 'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7), - // 'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8), - // 'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9), - // 'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10), - // 'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'), + 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'), + 'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1), + 'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2), + 'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3), + 'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4), + 'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5), + 'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6), + 'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7), + 'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8), + 'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9), + 'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10), + 'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'), 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'), - // 'xpack-securitySolutionCypress': { processNumber -> - // whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) { - // kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber) - // } - // }, + 'xpack-securitySolutionCypress': { processNumber -> + whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) { + kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber) + } + }, // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'), ]), diff --git a/src/plugins/telemetry/public/index.ts b/src/plugins/telemetry/public/index.ts index 3ad7fdd16c895..665c89ba2bffa 100644 --- a/src/plugins/telemetry/public/index.ts +++ b/src/plugins/telemetry/public/index.ts @@ -17,13 +17,10 @@ * under the License. */ -import { inspect } from 'util'; import { PluginInitializerContext } from 'kibana/public'; import { TelemetryPlugin, TelemetryPluginConfig } from './plugin'; export { TelemetryPluginStart, TelemetryPluginSetup } from './plugin'; export function plugin(initializerContext: PluginInitializerContext) { - // eslint-disable-next-line - console.log(inspect('test')); return new TelemetryPlugin(initializerContext); }