From d713ac488950f3b83ae6b16f1d123ad42a55ecdf Mon Sep 17 00:00:00 2001 From: Shanqing Cai Date: Mon, 1 Aug 2016 06:37:07 -0800 Subject: [PATCH] Add gcs_test/Dockerfile to version roll That is, cover the file with update_version.sh Also manually update the artifact URL to 0.10.0rc0 to fix the current breakage in nightly gcs smoke test: http://ci.tensorflow.org/view/Nightly/job/nightly-gcs-smoke/ Change: 128984024 --- tensorflow/tools/ci_build/update_version.sh | 7 +++++++ tensorflow/tools/gcs_test/Dockerfile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh index 1d1e492ef87..dd02d02d17f 100755 --- a/tensorflow/tools/ci_build/update_version.sh +++ b/tensorflow/tools/ci_build/update_version.sh @@ -131,6 +131,13 @@ check_existence file "${TEST_SERVER_DOCKER_FILE}" sed -i -r -e "s/(.*tensorflow-)([0-9]+\.[0-9]+\.[[:alnum:]]+)(-.*\.whl)/\1${MAJOR}.${MINOR}.${PATCH}\3/g" "${TEST_SERVER_DOCKER_FILE}" +# Update tensorflow/tools/gcs_test/Dockerfile +GCS_TEST_DOCKER_FILE="${TF_SRC_DIR}/tools/gcs_test/Dockerfile" + +check_existence file "${GCS_TEST_DOCKER_FILE}" + +sed -i -r -e "s/(.*tensorflow-)([0-9]+\.[0-9]+\.[[:alnum:]]+)(-.*\.whl)/\1${MAJOR}.${MINOR}.${PATCH}\3/g" "${GCS_TEST_DOCKER_FILE}" + # Updates to be made if there are major / minor version changes MAJOR_MINOR_CHANGE=0 diff --git a/tensorflow/tools/gcs_test/Dockerfile b/tensorflow/tools/gcs_test/Dockerfile index be3ad40b157..2831a07de76 100644 --- a/tensorflow/tools/gcs_test/Dockerfile +++ b/tensorflow/tools/gcs_test/Dockerfile @@ -16,7 +16,7 @@ RUN ./install_google_cloud_sdk.bash --disable-prompts --install-dir=/var/gcloud # Install nightly TensorFlow pip RUN pip install \ - http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.9.0-cp27-none-linux_x86_64.whl + http://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp27-none-linux_x86_64.whl # Copy test files RUN mkdir -p /gcs-smoke/python