[CI] Switch all ubuntu_nightly_cpu to ubuntu_cpu, ubuntu_nightly_gpu …

…to ubuntu_build_cuda (#18189) * consolidate ci by switching to ubuntu_cpu * rm Dockerfile.build.ubuntu_nightly_cpu * test gpu * rm ubuntu_gpu_nightly and rat from groovy * add rat check back * delete spaces * done Co-authored-by: Ubuntu <[email protected]>
apache · May 1, 2020 · bbc1720 · bbc1720
1 parent afb7505
commit bbc1720
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 161 deletions.
diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu
@@ -127,6 +127,10 @@ RUN /work/ubuntu_julia.sh
 COPY install/ubuntu_perl.sh /work/
 RUN /work/ubuntu_perl.sh
 
+# MXNetJS nightly needs emscripten for wasm
+COPY install/ubuntu_emscripten.sh /work/
+RUN /work/ubuntu_emscripten.sh
+
 ARG USER_ID=0
 COPY install/docker_filepermissions.sh /work/
 RUN /work/docker_filepermissions.sh

diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
diff --git a/tests/nightly/Jenkinsfile b/tests/nightly/Jenkinsfile
@@ -34,63 +34,63 @@ core_logic: {
       node(NODE_LINUX_CPU) {
         ws('workspace/nt-amalgamation1') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_amalgamation USE_BLAS=atlas', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_test_amalgamation USE_BLAS=atlas', false)
         }
       }
     },
     'Amalgamation-atlas-min: CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/nt-amalgamation2') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_amalgamation USE_BLAS=atlas MIN=1', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_test_amalgamation USE_BLAS=atlas MIN=1', false)
         }
       }
     },
     'Amalgamation-atlas-mkl: CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/nt-amalgamation3') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_amalgamation USE_BLAS=atlas MSHADOW_USE_MKL=1', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_test_amalgamation USE_BLAS=atlas MSHADOW_USE_MKL=1', false)
         }
       }
     },
     'Amalgamation-atlas-cuda: CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/nt-amalgamation4') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_amalgamation USE_BLAS=atlas MSHADOW_USE_CUDA=1', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_test_amalgamation USE_BLAS=atlas MSHADOW_USE_CUDA=1', false)
         }
       }
     },
     'Amalgamation-atlas-openmp: CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/nt-amalgamation5') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_amalgamation USE_BLAS=atlas DISABLE_OPENMP=0', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_test_amalgamation USE_BLAS=atlas DISABLE_OPENMP=0', false)
         }
       }
     },
     'Java Demo: CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/java-demo') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_java_demo_test_cpu', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_java_demo_test_cpu', false)
         }
       }
     },
     'Scala Demo: CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/scala-demo') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_scala_demo_test_cpu', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_scala_demo_test_cpu', false)
         }
       }
     },
     'MXNetJS: CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/nt-mxnetjs') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_javascript', false)
+          utils.docker_run('ubuntu_cpu', 'nightly_test_javascript', false)
         }
       }
     }

diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries
@@ -43,7 +43,7 @@ core_logic: {
       node(NODE_LINUX_GPU) {
         ws('workspace/build-cpu-int64') {
           utils.init_git()
-          utils.docker_run('ubuntu_nightly_cpu', 'build_ubuntu_cpu_large_tensor', false)
+          utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_large_tensor', false)
           utils.pack_lib('cpu_int64', mx_lib)
         }
       }
@@ -55,40 +55,40 @@ core_logic: {
       node(NODE_LINUX_GPU) {
         ws('workspace/nt-ImageClassificationTest') {
           utils.unpack_and_init('gpu', mx_lib)
-          utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_image_classification', true)
+          utils.docker_run('ubuntu_build_cuda', 'nightly_test_image_classification', true)
         }
       }
     },
     'ImageNet Inference: GPU': {
       node(NODE_LINUX_GPU) {
         ws('workspace/nt-ImageInferenceTest') {
           utils.unpack_and_init('gpu', mx_lib)
-          utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true)
+          utils.docker_run('ubuntu_build_cuda', 'nightly_test_imagenet_inference', true)
         }
       }
     },
     'KVStore_SingleNode: GPU': {
       node('mxnetlinux-gpu-p3-8xlarge') {
         ws('workspace/nt-KVStoreTest') {
           utils.unpack_and_init('gpu', mx_lib)
-          utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true)
+          utils.docker_run('ubuntu_build_cuda', 'nightly_test_KVStore_singleNode', true)
         }
       }
     },
     'Test Large Tensor Size: CPU': {
       node(NODE_LINUX_GPU) {
         ws('workspace/large_tensor-cpu') {
             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)
+            utils.docker_run('ubuntu_cpu', 'nightly_test_large_tensor', false)
+            utils.docker_run('ubuntu_cpu', 'nightly_test_large_vector', false)
         }
       }
     },
     'Gluon estimator: GPU': {
       node(NODE_LINUX_GPU) {
         ws('workspace/estimator-test-gpu') {
           utils.unpack_and_init('gpu', mx_lib)
-          utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true)
+          utils.docker_run('ubuntu_build_cuda', 'nightly_estimator', true)
         }
       }
     }

diff --git a/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC b/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
@@ -34,7 +34,7 @@ core_logic: {
       ws('workspace/modelBackwardsCompat') {
         utils.init_git()
         // Train models on older versions
-        utils.docker_run('ubuntu_nightly_cpu', 'nightly_model_backwards_compat_train', false)
+        utils.docker_run('ubuntu_cpu', 'nightly_model_backwards_compat_train', false)
         // upload files to S3 here outside of the docker environment
         sh "./tests/nightly/model_backwards_compatibility_check/upload_models_to_s3.sh"
       }
@@ -56,7 +56,7 @@ core_logic: {
       ws('workspace/modelBackwardsCompat') {
         utils.unpack_and_init('cpu', mx_lib)
         // Perform inference on the latest version of MXNet
-        utils.docker_run('ubuntu_nightly_cpu', 'nightly_model_backwards_compat_test', false)
+        utils.docker_run('ubuntu_cpu', 'nightly_model_backwards_compat_test', false)
       }
     }
   }