Remove last references to legacyJobRunner

elastic · Jan 22, 2020 · 4111245 · 4111245
1 parent 3e0a433
commit 4111245
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.ci/Jenkinsfile_coverage b/.ci/Jenkinsfile_coverage
@@ -16,14 +16,14 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
                 withEnv([
                   'NODE_ENV=test' // Needed for jest tests only
                 ]) {
-                  kibanaPipeline.legacyJobRunner('kibana-intake')()
+                  kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
                 }
               },
               'x-pack-intake-agent': {
                 withEnv([
                   'NODE_ENV=test' // Needed for jest tests only
                 ]) {
-                  kibanaPipeline.legacyJobRunner('x-pack-intake')()
+                  kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh')()
                 }
               },
               'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [

diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -26,8 +26,8 @@ timeout(time: 120, unit: 'MINUTES') {
         withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
           parallel([
             // TODO we just need to run integration tests from intake?
-            'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'), // TODO change these
-            'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'), // TODO change these
+            'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
+            'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
             'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
               'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
               'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),