Cleaner implementation of py36 testing (#384)

Author: seanpmorgan

tools/ci_testing/addons_cpu.sh

@@ -31,7 +31,6 @@ if [[ ${PLATFORM} == "darwin" ]]; then
     N_JOBS=$(sysctl -n hw.ncpu)
 else
     N_JOBS=$(grep -c ^processor /proc/cpuinfo)
-    tools/ci_testing/install_py36.sh # Patch to test on py36
 fi
 
 
@@ -40,7 +39,7 @@ echo "Bazel will use ${N_JOBS} concurrent job(s)."
 echo ""
 
 export CC_OPT_FLAGS='-mavx'
-export TF_NEED_CUDA=0 # TODO: Verify this is used in GPU custom-op
+export TF_NEED_CUDA=0
 
 export PYTHON_BIN_PATH=`which python`
 ls -alh $PYTHON_BIN_PATH

tools/ci_testing/addons_gpu.sh

@@ -25,7 +25,6 @@ fi
 
 set -x
 
-tools/ci_testing/install_py36.sh # Patch to test on py36
 N_JOBS=1 # Must limit GPU testing to single job to prevent OOM error.
 
 echo ""

tools/ci_testing/install_py36.sh

@@ -25,6 +25,7 @@ apt-get -y -qq update && apt-get -y -qq install python3.6
 
 python3.6 get-pip.py -q
 python3.6 -m pip --version
+rm get-pip.py
 
 ln -sfn /usr/bin/python3.6 /usr/bin/python3
 pip3 install scipy  # Pre-installed in custom-op

tools/run_docker.sh

@@ -88,7 +88,7 @@ if [[ -z "${COMMAND}" ]]; then
     exit 1
 fi
 
-DOCKER_CMD="ln -sf ${PYTHON_LIB} /usr/bin/python && ${COMMAND}"
+DOCKER_CMD="tools/ci_testing/install_py36.sh && ln -sf ${PYTHON_LIB} /usr/bin/python && ${COMMAND}"
 echo "Docker image: ${DOCKER_IMAGE}"
 echo "Docker command: ${DOCKER_CMD}"
 docker run ${DOCKER_OPTS}                   \