[incubator-mxnet] branch v1.3.x updated: Fixes installation nightly test by filtering out the git commands (#14145)

[srochel]

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

srochel pushed a commit to branch v1.3.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/v1.3.x by this push:
     new 87eb1ad  Fixes installation nightly test by filtering out the git 
commands (#14145)
87eb1ad is described below

commit 87eb1ad242078ca1ca848a2b2fcb6b8897b99bba
Author: perdasilva <perdasi...@gmail.com>
AuthorDate: Fri Feb 15 00:56:22 2019 +0100

    Fixes installation nightly test by filtering out the git commands (#14145)
    
    Thanks. Please do cherry-pick into v1.4.x branch.
---
 tests/jenkins/run_test_installation_docs.sh | 31 +++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/tests/jenkins/run_test_installation_docs.sh 
b/tests/jenkins/run_test_installation_docs.sh
index d25f1d5..4f62865 100755
--- a/tests/jenkins/run_test_installation_docs.sh
+++ b/tests/jenkins/run_test_installation_docs.sh
@@ -250,6 +250,29 @@ function set_instruction_set() {
         ${sorted_indexes[$end_buildfromsource_command_index]})
 }
 
+# given a $buildfromsource_commands string, filter out any build commands that 
should not be executed
+# during the build from source tests. An example, the build from source 
instructions include the commands:
+# $ git clone --recursive https://github.com/apache/incubator-mxnet 
+# $ cd incubator-mxnet 
+# if these commands get executed in the jenkins job, we will be testing the 
build from source instructions
+# against the master branch and not against the version of the repository that 
Jenkins checksout for testing.
+# This presents a particularly big problem for the version branches and their 
nightly builds. Because, 
+# we would, in effect, be testing the build from source instructions for one 
version of MXNet against
+# the master branch.
+# in this function we target the commands cited in the example above, but 
leave it open for expantion
+# in the future.
+# See also gh issue: https://github.com/apache/incubator-mxnet/issues/13800
+function filter_build_commands() {
+    filtered_build_commands="${1}"
+
+    # Remove git commands
+    filtered_build_commands=`echo "${filtered_build_commands}" | perl -pe 
's/git .*?;//g'`
+
+    # Remove 'cd incubator-mxnet'
+    filtered_build_commands=`echo "${filtered_build_commands}" | perl -pe 
's/cd incubator-mxnet;//'`
+
+    echo "${filtered_build_commands}"
+}
 
 ########################LINUX-PYTHON-CPU############################
 echo
@@ -302,8 +325,8 @@ ubuntu_python_cpu_source()
     set -e
     echo
     echo "### Testing Build From Source ###"
-    echo "${buildfromsource_commands}"
-    echo
+    buildfromsource_commands=$(filter_build_commands 
"${buildfromsource_commands}")
+    echo ${buildfromsource_commands}
     eval ${buildfromsource_commands}
     echo "ubuntu_python_cpu_source: MXNet Installed Successfully"
 
@@ -363,8 +386,8 @@ ubuntu_python_gpu_source()
     set -e
     echo
     echo "### Testing Build From Source ###"
-    echo "${buildfromsource_commands}"
-    echo
+    buildfromsource_commands=$(filter_build_commands 
"${buildfromsource_commands}")
+    echo ${buildfromsource_commands}
     eval ${buildfromsource_commands}
     echo "ubuntu_python_gpu_source: MXNet Installed Successfully"