Skip to content
This repository has been archived by the owner on Mar 31, 2024. It is now read-only.

Commit

Permalink
Revert "temporarily force failure and only run siem cypress task"
Browse files Browse the repository at this point in the history
This reverts commit 23c57f4.
  • Loading branch information
spalger committed Jul 22, 2020
1 parent 01c9b6e commit 0276385
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 33 deletions.
64 changes: 32 additions & 32 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,39 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: 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-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
// '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-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.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-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-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-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.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-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('timeline flyout button', () => {
before(() => {
loginAndWaitForPage(HOSTS_URL);
waitForAllHostsToBeLoaded();
throw new Error('oh no something is broken');
});

afterEach(() => {
Expand Down

0 comments on commit 0276385

Please sign in to comment.