Skip to content

Commit 4ff20b4

Browse files
kibanamachinekibanamachine
authored
Merge branch '7.12' into backport/7.12/pr-92081
2 parents ec8e0cd + 7f5f914 commit 4ff20b4

33 files changed

Lines changed: 1408 additions & 255 deletions

File tree

‎.ci/Jenkinsfile_security_cypress‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ kibanaPipeline(timeoutMinutes: 180) {
1717

1818
workers.ci(name: job, size: 'l', ramDisk: true) {
1919
kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
20-
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
21-
// Temporarily disabled to figure out test flake
22-
// kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
20+
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress.sh')()
2321
}
2422
}
2523
}

0 commit comments

Comments
 (0)