Revert "Add some test code to be deleted"

This reverts commit c83a119.
elastic · Nov 14, 2019 · 35e045a · 35e045a
1 parent c83a119
commit 35e045a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 25 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -9,25 +9,25 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
       ansiColor('xterm') {
         catchError {
           parallel([
-            // 'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
-            // 'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
-            // 'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
-            //   'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
-            //   'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
-            //   'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
-            //   'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
-            //   'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
-            //   'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
-            //   'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
-            //   'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
-            //   'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
-            //   'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
-            //   'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
-            //   'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
-            //   'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
-            //   'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }),
-            //   'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
-            // ]),
+            'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
+            'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+            'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
+              'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
+              'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
+              'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
+              'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
+              'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
+              'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
+              'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
+              'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
+              'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
+              'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
+              'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
+              'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
+              'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
+              'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }),
+              'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
+            ]),
             'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
               'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
               'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),

diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
@@ -129,16 +129,10 @@ def jobRunner(label, useRamDisk, closure) {
 
     def scmVars
 
-    def count = 0
     // Try to clone from Github up to 8 times, waiting 15 secs between attempts
     retry(8) {
       try {
-        count++
         scmVars = checkout scm
-
-        if (count < 2) {
-          error("TODO delete me")
-        }
       } catch (ex) {
         sleep 15
         throw ex