Revert "[DEBUG] executes only Security Cypress tests"

This reverts commit 6a08930.
elastic · Jun 26, 2020 · 5ac501c · 5ac501c
1 parent dce4dea
commit 5ac501c
Showing 1 changed file with 33 additions and 33 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -9,43 +9,43 @@ 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'),
+          '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-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-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_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)
-             // }
+            '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)
+              }
             },
 
             // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),