[ci] Revert security solution cypress file name change (elastic#92882)

Reverts the security solution cypress name change elastic#92516 that was backported to 7.12. Originally seemed that update to cypress tests where they were split into chrome and firefox was backported to 7.12, but they weren't. The subsequent PR to disable firefox tests was bacported to 7.12 and this created the issue as it was now looking for a non-existent chrome specific config.
kertal · Feb 25, 2021 · 7f5f914 · 7f5f914
1 parent 2b73361
commit 7f5f914
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 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')()
         }
       }
     }

diff --git a/vars/tasks.groovy b/vars/tasks.groovy
@@ -126,9 +126,7 @@ def functionalXpack(Map params = [:]) {
       'x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx',
     ]) {
       if (githubPr.isPr()) {
-        task(kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypressChrome', './test/scripts/jenkins_security_solution_cypress_chrome.sh'))
-        // Temporarily disabled to figure out test flake
-        // task(kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypressFirefox', './test/scripts/jenkins_security_solution_cypress_firefox.sh'))
+        task(kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh'))
       }
     }
   }