[incubator-mxnet] branch master updated: Fix PyPI Packages and Python Docker Images nightly release (#18222)

[lausen]

This is an automated email from the ASF dual-hosted git repository.

lausen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new c329a52  Fix PyPI Packages and Python Docker Images nightly release 
(#18222)
c329a52 is described below

commit c329a524c520ec2b41aa4bff5ee113ff7221b790
Author: Manu Seth <22492939+mset...@users.noreply.github.com>
AuthorDate: Tue May 5 09:51:37 2020 -0700

    Fix PyPI Packages and Python Docker Images nightly release (#18222)
    
    * remove OS from s3 library path
    
    * fix bash script run commands
    
    * Revert "remove OS from s3 library path"
    
    This reverts commit 266511305ba1ac56582ee9b867d0a64ad3d60378.
    
    * hardcode s3 path for upload/download of binaries
    
    Co-authored-by: Ubuntu <ubu...@ip-172-31-3-62.us-west-2.compute.internal>
---
 cd/Jenkinsfile_utils.groovy              | 4 ++--
 cd/python/docker/Jenkins_pipeline.groovy | 6 +++---
 cd/python/pypi/Jenkins_pipeline.groovy   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cd/Jenkinsfile_utils.groovy b/cd/Jenkinsfile_utils.groovy
index 194c72e..b345d4e 100644
--- a/cd/Jenkinsfile_utils.groovy
+++ b/cd/Jenkinsfile_utils.groovy
@@ -116,12 +116,12 @@ def push_artifact(libmxnet_path, variant, libtype, 
license_paths = '', dependenc
   if(license_paths == null) license_paths = ''
   if(dependency_paths == null) dependency_paths = ''
 
-  sh "python3 ./cd/utils/artifact_repository.py --push --verbose --libtype 
${libtype} --variant ${variant} --libmxnet ${libmxnet_path} --licenses 
${license_paths} --dependencies ${dependency_paths}"
+  sh "python3 ./cd/utils/artifact_repository.py --push --verbose --libtype 
${libtype} --variant ${variant} --libmxnet ${libmxnet_path} --licenses 
${license_paths} --dependencies ${dependency_paths} --os ubuntu18.04"
 }
 
 // pull artifact from repository
 def pull_artifact(variant, libtype, destination = '') {
-  sh "python3 ./cd/utils/artifact_repository.py --pull --verbose --libtype 
${libtype} --variant ${variant} --destination ${destination}"
+  sh "python3 ./cd/utils/artifact_repository.py --pull --verbose --libtype 
${libtype} --variant ${variant} --destination ${destination} --os ubuntu18.04"
 }
 
 // pulls artifact from repository and places files in the appropriate 
directories
diff --git a/cd/python/docker/Jenkins_pipeline.groovy 
b/cd/python/docker/Jenkins_pipeline.groovy
index bb9c48e..5d7a580 100644
--- a/cd/python/docker/Jenkins_pipeline.groovy
+++ b/cd/python/docker/Jenkins_pipeline.groovy
@@ -49,21 +49,21 @@ def build(mxnet_variant) {
     ci_utils.docker_run(environment, "cd_package_pypi ${mxnet_variant}", 
nvidia_docker)
 
     // build python docker images
-    sh "python3 ./cd/python/docker/python_images.sh build ${mxnet_variant}"
+    sh "./cd/python/docker/python_images.sh build ${mxnet_variant}"
   }
 }
 
 def test(mxnet_variant) {
   ws("workspace/python_docker/${mxnet_variant}/${env.BUILD_NUMBER}") {
     // test python docker images
-    sh "python3 ./cd/python/docker/python_images.sh test ${mxnet_variant}"
+    sh "./cd/python/docker/python_images.sh test ${mxnet_variant}"
   }
 }
 
 def push(mxnet_variant) {
   ws("workspace/python_docker/${mxnet_variant}/${env.BUILD_NUMBER}") {
     // push python docker images
-    sh "python3 ./cd/python/docker/python_images.sh push ${mxnet_variant}"
+    sh "./cd/python/docker/python_images.sh push ${mxnet_variant}"
   }
 }
 
diff --git a/cd/python/pypi/Jenkins_pipeline.groovy 
b/cd/python/pypi/Jenkins_pipeline.groovy
index 6791f4f..0d813de 100644
--- a/cd/python/pypi/Jenkins_pipeline.groovy
+++ b/cd/python/pypi/Jenkins_pipeline.groovy
@@ -66,11 +66,11 @@ def push(mxnet_variant) {
   ws("workspace/python_pypi/${mxnet_variant}/${env.BUILD_NUMBER}") {
     // publish package to pypi
     if (mxnet_variant in pypi_releases) {
-      sh "python3 ./ci/docker/runtime_functions.sh cd_pypi_publish"
+      sh "./ci/docker/runtime_functions.sh cd_pypi_publish"
     } else {
       echo "Temporarily skipping publishing PyPI package for 
'${mxnet_variant}'."
     }
-    sh "python3 ./ci/docker/runtime_functions.sh cd_s3_publish"
+    sh "./ci/docker/runtime_functions.sh cd_s3_publish"
   }
 }