address comments

apache · Jan 17, 2019 · 8bb808b · 8bb808b
1 parent 8cc7508
commit 8bb808b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -1285,6 +1285,16 @@ deploy_jl_docs() {
     # ...
 }
 
+build_scala_static_mkl() {
+    set -ex
+    pushd .
+    scala_prepare
+    export MAVEN_PUBLISH_OS_TYPE=linux-x86_64-cpu
+    export mxnet_variant=mkl
+    ./ci/publish/scala/build.sh
+    popd
+}
+
 publish_scala_build() {
     set -ex
     pushd .

diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
@@ -525,9 +525,9 @@ def test_static_scala_cpu() {
   return ['Static build CPU 14.04 Scala' : {
     node(NODE_LINUX_CPU) {
         ws('workspace/ut-publish-scala-cpu') {
-          withEnv(["MAVEN_PUBLISH_OS_TYPE=linux-x86_64-cpu", "mxnet_variant=mkl"]) {
+          timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run("publish.ubuntu1404_cpu", 'publish_scala_build', false, '500m', 'MAVEN_PUBLISH_OS_TYPE mxnet_variant')
+            utils.docker_run("publish.ubuntu1404_cpu", 'build_scala_static_mkl', false)
           }
         }
     }

diff --git a/tools/staticbuild/README.md b/tools/staticbuild/README.md
@@ -21,7 +21,7 @@ This script would clone the most up-to-date master and build the MXNet backend w
 
 - `DEPS_PATH` Path to your static dependencies
 - `STATIC_BUILD_TARGET` Either `pip` or `maven` as your publish platform
-- `PLATFORM` linux, osx
+- `PLATFORM` linux, darwin
 - `VARIANT` cpu, cu*, cu*mkl, mkl
 
 It is not recommended to run this file alone since there are a bunch of variables need to be set.