[ https://issues.apache.org/jira/browse/BEAM-3987?focusedWorklogId=87180&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-87180 ]
ASF GitHub Bot logged work on BEAM-3987: ---------------------------------------- Author: ASF GitHub Bot Created on: 03/Apr/18 17:38 Start Date: 03/Apr/18 17:38 Worklog Time Spent: 10m Work Description: lukecwik closed pull request #4998: [BEAM-3987] Use gradle and not maven in sdks/python/container/run_val… URL: https://github.com/apache/beam/pull/4998 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/sdks/python/container/run_validatescontainer.sh b/sdks/python/container/run_validatescontainer.sh index ba601b5b4a3..679879e4185 100755 --- a/sdks/python/container/run_validatescontainer.sh +++ b/sdks/python/container/run_validatescontainer.sh @@ -46,20 +46,8 @@ command -v gcloud docker -v gcloud -v -# ensure maven version is 3.5 or above -TMPDIR=$(mktemp -d) -MVN=$(which mvn) -mvn_ver=$($MVN -v | head -1 | awk '{print $3}') -if [[ "$mvn_ver" < "3.5" ]] -then - pushd $TMPDIR - curl http://www.apache.org/dist/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.tar.gz --output maven.tar.gz - tar xf maven.tar.gz - MVN="$(pwd)/apache-maven-3.5.2/bin/mvn" - popd -fi - # ensure gcloud is version 186 or above +TMPDIR=$(mktemp -d) gcloud_ver=$(gcloud -v | head -1 | awk '{print $4}') if [[ "$gcloud_ver" < "186" ]] then @@ -77,7 +65,7 @@ fi TAG=$(date +%Y%m%d-%H%M%S) CONTAINER=us.gcr.io/$PROJECT/$USER/python echo "Using container $CONTAINER" -$MVN clean install -DskipTests -Pbuild-containers --projects sdks/python/container -Ddocker-repository-root=us.gcr.io/$PROJECT/$USER -Ddockerfile.tag=$TAG -amd +./gradlew :sdks:python:container:docker -Pdocker-repository-root=us.gcr.io/$PROJECT/$USER -Pdocker-tag=$TAG # Verify it exists docker images | grep $TAG @@ -117,7 +105,7 @@ python setup.py nosetests \ # Delete the container locally and remotely docker rmi $CONTAINER:$TAG || echo "Failed to remove container" -gcloud container images delete $CONTAINER:$TAG || echo "Failed to delete container" +gcloud --quiet container images delete $CONTAINER:$TAG || echo "Failed to delete container" # Clean up tempdir rm -rf $TMPDIR ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 87180) Time Spent: 1h (was: 50m) > Use gradle and not maven in sdks/python/container/run_validatescontainer.sh > --------------------------------------------------------------------------- > > Key: BEAM-3987 > URL: https://issues.apache.org/jira/browse/BEAM-3987 > Project: Beam > Issue Type: Sub-task > Components: build-system > Reporter: Alan Myrvold > Assignee: Alan Myrvold > Priority: Major > Fix For: 2.5.0 > > Time Spent: 1h > Remaining Estimate: 0h > > Update sdks/python/container/run_validatescontainer.sh to use gradle and not > maven -- This message was sent by Atlassian JIRA (v7.6.3#76005)