From 7f5f91495b40afcfc9bc0d7e11ac6528d042e8bd Mon Sep 17 00:00:00 2001 From: Yara Tercero Date: Thu, 25 Feb 2021 12:55:55 -0800 Subject: [PATCH] [ci] Revert security solution cypress file name change (#92882) Reverts the security solution cypress name change #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. --- .ci/Jenkinsfile_security_cypress | 4 +--- vars/tasks.groovy | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.ci/Jenkinsfile_security_cypress b/.ci/Jenkinsfile_security_cypress index 811af44d1ca56..f7b02cd1c4ab1 100644 --- 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 index a61035403dabd..24ea5f9c8c887 100644 --- 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')) } } }