Move build to tasks

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
elastic · Feb 18, 2021 · 20c12bf · 20c12bf
1 parent 4435a31
commit 20c12bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/test/scripts/jenkins_build_ts_refs.sh b/test/scripts/jenkins_build_ts_refs.sh
@@ -2,5 +2,5 @@
 
 source src/dev/ci_setup/setup_env.sh
 
-echo " -> building Typescript References"
-node scripts/build_ts_refs.js
+checks-reporter-with-killswitch "Build Typescript References" \
+  node scripts/build_ts_refs.js
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
@@ -425,10 +425,6 @@ def buildXpackPlugins() {
   runbld('./test/scripts/jenkins_xpack_build_plugins.sh', 'Build X-Pack Plugins')
 }
 
-def buildTypescriptRefs() {
-  runbld('./test/scripts/jenkins_build_ts_refs.sh', 'Build Typescript References')
-}
-
 def withTasks(Map params = [worker: [:]], Closure closure) {
   catchErrors {
     def config = [name: 'ci-worker', size: 'xxl', ramDisk: true] + (params.worker ?: [:])
@@ -445,7 +441,6 @@ def withTasks(Map params = [worker: [:]], Closure closure) {
           // There are integration tests etc that require the plugins to be built first, so let's go ahead and build them before set up the parallel workspaces
           ossPlugins: { buildOssPlugins() },
           xpackPlugins: { buildXpackPlugins() },
-          buildTSRefs: { buildTypescriptRefs() },
         ])
 
         catchErrors {

diff --git a/vars/tasks.groovy b/vars/tasks.groovy
@@ -18,6 +18,9 @@ def check() {
     kibanaPipeline.scriptTask('Verify NOTICE', 'test/scripts/checks/verify_notice.sh'),
     kibanaPipeline.scriptTask('Test Projects', 'test/scripts/checks/test_projects.sh'),
     kibanaPipeline.scriptTask('Test Hardening', 'test/scripts/checks/test_hardening.sh'),
+    dir("${env.WORKSPACE}/kibana") {
+      kibanaPipeline.scriptTask('Build TS Refs', 'test/scripts/jenkins_build_ts_refs.sh')()
+    }
   ])
 }