diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 3da6c52490e9..a71c6827662b 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -868,6 +868,14 @@ unittest_ubuntu_cpu_clojure() { ./contrib/clojure-package/ci-test.sh } +unittest_ubuntu_cpu_clojure_integration() { + set -ex + make scalapkg USE_OPENCV=1 USE_BLAS=openblas USE_DIST_KVSTORE=1 ENABLE_TESTCOVERAGE=1 + make scalainstall USE_OPENCV=1 USE_BLAS=openblas USE_DIST_KVSTORE=1 ENABLE_TESTCOVERAGE=1 + ./contrib/clojure-package/integration-tests.sh +} + + unittest_ubuntu_cpugpu_perl() { set -ex ./perl-package/test.sh diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 8b0e83e1ab19..55b2c289e85e 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -887,6 +887,19 @@ def test_unix_clojure_cpu() { }] } +def test_unix_clojure_integration_cpu() { + return ['Clojure: CPU Integration': { + node(NODE_LINUX_CPU) { + ws('workspace/ut-clojure-integration-cpu') { + timeout(time: max_time, unit: 'MINUTES') { + utils.unpack_and_init('cpu', mx_dist_lib, true) + utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_clojure_integration', false) + } + } + } + }] +} + def test_unix_r_cpu() { return ['Perl: CPU': { node(NODE_LINUX_CPU) { diff --git a/ci/jenkins/Jenkinsfile_unix_cpu b/ci/jenkins/Jenkinsfile_unix_cpu index 2fe45764fe0c..73369b404738 100644 --- a/ci/jenkins/Jenkinsfile_unix_cpu +++ b/ci/jenkins/Jenkinsfile_unix_cpu @@ -52,6 +52,7 @@ core_logic: { custom_steps.test_unix_scala_cpu(), custom_steps.test_unix_scala_mkldnn_cpu(), custom_steps.test_unix_clojure_cpu(), + custom_steps.test_unix_clojure_integration_cpu(), custom_steps.test_unix_r_cpu(), custom_steps.test_unix_julia07_cpu(), custom_steps.test_unix_julia10_cpu(), diff --git a/contrib/clojure-package/integration-tests.sh b/contrib/clojure-package/integration-tests.sh index 6e5868712026..ce480a507f92 100755 --- a/contrib/clojure-package/integration-tests.sh +++ b/contrib/clojure-package/integration-tests.sh @@ -18,11 +18,15 @@ set -evx -MXNET_HOME=$(cd "$(dirname $0)/../.."; pwd) +MXNET_HOME=${PWD} +cd ${MXNET_HOME}/contrib/clojure-package +# first build the package and install it +lein install + +# then run through the examples EXAMPLES_HOME=${MXNET_HOME}/contrib/clojure-package/examples -#cd ${MXNET_HOME}/contrib/clojure-package -#lein test -#lein cloverage --codecov -for test_dir in `find ${EXAMPLES_HOME} -name test` ; do - cd ${test_dir} && lein test -done +# use AWK pattern for blacklisting +TEST_CASES=`find ${EXAMPLES_HOME} -name test | awk '!/dontselect1|dontselect2/'` +for i in $TEST_CASES ; do + cd ${i} && lein test +done \ No newline at end of file diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index eb003097f61b..d144e82bdb5c 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -106,6 +106,14 @@ core_logic: { utils.docker_run('ubuntu_nightly_gpu', 'nightly_tutorial_test_ubuntu_python3_gpu', true) } } + }, + 'Clojure Nightly: CPU': { + node(NODE_LINUX_GPU) { + ws('workspace/clojure') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'unittest_ubuntu_cpu_clojure_integration', false) + } + } } } }