[beam] branch master updated: [BEAM-4249] Fix failing validates container test

[pa...@apache.org]

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

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new b1d8db1  [BEAM-4249] Fix failing validates container test
b1d8db1 is described below

commit b1d8db16c08f53bdf4259a35bb20ca5b3f315717
Author: Alan Myrvold <am...@google.com>
AuthorDate: Tue May 15 15:34:31 2018 -0700

    [BEAM-4249] Fix failing validates container test
---
 ...ommit_Python_ValidatesContainer_Dataflow.groovy |  2 +-
 sdks/python/container/Dockerfile                   |  2 +-
 sdks/python/container/run_validatescontainer.sh    | 26 +---------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy
index 9034410..d37a63e 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy
@@ -20,7 +20,7 @@ import common_job_properties
 
 // This job runs the suite of Python ValidatesContainer tests against the
 // Dataflow runner.
-job('beam_PostCommit_Python_ValidatesContainer_Dataflow') {
+job('beam_PostCommit_Py_ValCont') {
   description('Runs Python ValidatesContainer suite on the Dataflow runner.')
 
   // Set common parameters.
diff --git a/sdks/python/container/Dockerfile b/sdks/python/container/Dockerfile
index 0e95dbe..7da26cf 100644
--- a/sdks/python/container/Dockerfile
+++ b/sdks/python/container/Dockerfile
@@ -64,7 +64,7 @@ RUN \
     pip install "google-cloud-pubsub == 0.26.0" && \
     pip install "google-cloud-bigquery == 0.25.0" && \
     # Optional packages
-    pip install "cython == 0.27.2" && \
+    pip install "cython == 0.28.1" && \
     pip install "guppy == 0.1.10" && \
     pip install "python-snappy == 0.5.1" && \
     # These are additional packages likely to be used by customers.
diff --git a/sdks/python/container/run_validatescontainer.sh b/sdks/python/container/run_validatescontainer.sh
index a1e11bc..de99535 100755
--- a/sdks/python/container/run_validatescontainer.sh
+++ b/sdks/python/container/run_validatescontainer.sh
@@ -28,9 +28,6 @@
 set -e
 set -v
 
-# pip install --user installation location.
-LOCAL_PATH=$HOME/.local/bin/
-
 # Where to store integration test outputs.
 GCS_LOCATION=gs://temp-storage-for-end-to-end-tests
 
@@ -46,21 +43,6 @@ command -v gcloud
 docker -v
 gcloud -v
 
-# ensure gcloud is version 186 or above
-TMPDIR=$(mktemp -d)
-gcloud_ver=$(gcloud -v | head -1 | awk '{print $4}')
-if [[ "$gcloud_ver" < "186" ]]
-then
-  pushd $TMPDIR
-  curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-186.0.0-linux-x86_64.tar.gz --output gcloud.tar.gz
-  tar xf gcloud.tar.gz
-  ./google-cloud-sdk/install.sh --quiet
-  . ./google-cloud-sdk/path.bash.inc
-  popd
-  gcloud components update --quiet || echo 'gcloud components update failed'
-  gcloud -v
-fi
-
 # Build the container
 TAG=$(date +%Y%m%d-%H%M%S)
 CONTAINER=us.gcr.io/$PROJECT/$USER/python
@@ -73,11 +55,8 @@ docker images | grep $TAG
 # Push the container
 gcloud docker -- push $CONTAINER
 
-# INFRA does not install virtualenv
-pip install virtualenv --user
-
 # Virtualenv for the rest of the script to run setup & e2e test
-${LOCAL_PATH}/virtualenv sdks/python/container
+virtualenv sdks/python/container
 . sdks/python/container/bin/activate
 cd sdks/python
 pip install -e .[gcp,test]
@@ -107,7 +86,4 @@ python setup.py nosetests \
 docker rmi $CONTAINER:$TAG || echo "Failed to remove container"
 gcloud --quiet container images delete $CONTAINER:$TAG || echo "Failed to delete container"
 
-# Clean up tempdir
-rm -rf $TMPDIR
-
 echo ">>> SUCCESS DATAFLOW RUNNER VALIDATESCONTAINER TEST"

-- 
To stop receiving notification emails like this one, please contact
pabloem@apache.org.