Merge branch '7.12' into backport/7.12/pr-92762

elastic · Feb 25, 2021 · e505fdf · e505fdf
2 parents cb7d12b + 7f5f914
commit e505fdf
Show file tree

Hide file tree

Showing 33 changed files with 1,408 additions and 255 deletions.
diff --git a/.ci/Jenkinsfile_security_cypress b/.ci/Jenkinsfile_security_cypress
@@ -17,9 +17,7 @@ kibanaPipeline(timeoutMinutes: 180) {
 
         workers.ci(name: job, size: 'l', ramDisk: true) {
           kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
-          kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
-          // Temporarily disabled to figure out test flake
-          // kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
+          kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress.sh')()
         }
       }
     }