From c2e9a885683774f229eebdcf2699f51bc3afb3d9 Mon Sep 17 00:00:00 2001
From: Leonard Lausen <lausen@amazon.com>
Date: Mon, 2 Mar 2020 15:29:10 -0800
Subject: [PATCH] Fix nightly tests pipeline (#17721)

---
 tests/nightly/Jenkinsfile                            |  2 +-
 tests/nightly/JenkinsfileForBinaries                 | 12 +++++-------
 .../JenkinsfileForMBCC                               |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/nightly/Jenkinsfile b/tests/nightly/Jenkinsfile
index 192f3d3452dc..9ea133e718d2 100755
--- a/tests/nightly/Jenkinsfile
+++ b/tests/nightly/Jenkinsfile
@@ -18,7 +18,7 @@
 //
 //This is a Jenkinsfile for nightly tests. The format and some functions have been picked up from the top-level Jenkinsfile
 
-mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/nnvm/lib/libnnvm.a'
+mx_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so, build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, build/3rdparty/openmp/runtime/src/libomp.so'
 
 node('utility') {
   // Loading the utilities requires a node context unfortunately
diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries
index 1a7ef1aaaa05..81c022c28990 100755
--- a/tests/nightly/JenkinsfileForBinaries
+++ b/tests/nightly/JenkinsfileForBinaries
@@ -18,9 +18,7 @@
 //
 //This is a Jenkinsfile for nightly tests. The format and some functions have been picked up from the top-level Jenkinsfile
 
-mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
-mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
-mx_lib_cpp_example_mkl = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, build/cpp-package/example/imagenet_inference'
+mx_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so, build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, build/3rdparty/openmp/runtime/src/libomp.so, build/cpp-package/example/*'
 
 node('utility') {
   // Loading the utilities requires a node context unfortunately
@@ -37,7 +35,7 @@ core_logic: {
         ws('workspace/build-mkldnn-gpu') {
           utils.init_git()
           utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_mkldnn', false)
-          utils.pack_lib('gpu', mx_lib_cpp_example_mkl)
+          utils.pack_lib('gpu', mx_lib)
         }
       }
     },
@@ -46,7 +44,7 @@ core_logic: {
         ws('workspace/build-cpu-int64') {
           utils.init_git()
           utils.docker_run('ubuntu_nightly_cpu', 'build_ubuntu_cpu_large_tensor', false)
-          utils.pack_lib('cpu_int64', mx_cmake_lib)
+          utils.pack_lib('cpu_int64', mx_lib)
         }
       }
     }
@@ -64,7 +62,7 @@ core_logic: {
     'ImageNet Inference: GPU': {
       node(NODE_LINUX_GPU) {
         ws('workspace/nt-ImageInferenceTest') {
-          utils.unpack_and_init('gpu', mx_lib_cpp_example_mkl)
+          utils.unpack_and_init('gpu', mx_lib)
           utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true)
         }
       }
@@ -80,7 +78,7 @@ core_logic: {
     'Test Large Tensor Size: CPU': {
       node(NODE_LINUX_GPU) {
         ws('workspace/large_tensor-cpu') {
-            utils.unpack_and_init('cpu_int64', mx_cmake_lib)
+            utils.unpack_and_init('cpu_int64', mx_lib)
             utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_large_tensor', false)
             utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_large_vector', false)
         }
diff --git a/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC b/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
index e419aa7424be..e42e495dc230 100644
--- a/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
+++ b/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
@@ -18,7 +18,7 @@
 //
 //This is a Jenkinsfile for the model backwards compatibility checker. The format and some functions have been picked up from the top-level Jenkinsfile.
 
-mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
+mx_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so, build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, build/3rdparty/openmp/runtime/src/libomp.so'
 
 node('restricted-utility') {
   // Loading the utilities requires a node context unfortunately