diff options
| author | Matt Kwong <mattkwong@google.com> | 2017-12-19 17:09:54 -0800 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2017-12-20 14:56:13 -0800 |
| commit | 6003a61255fe508924878ef0ce8207996e7b5d3c (patch) | |
| tree | aa024c251ff956b970f6e60b7409758b1a50782c /kokoro/linux/pull_request_in_docker.sh | |
| parent | 8ac050fadd7d08eae525a5a227a1e87ea15d57fc (diff) | |
| download | protobuf-6003a61255fe508924878ef0ce8207996e7b5d3c.tar.gz protobuf-6003a61255fe508924878ef0ce8207996e7b5d3c.tar.bz2 protobuf-6003a61255fe508924878ef0ce8207996e7b5d3c.zip | |
Make Kokoro job pull Dockerimage from Dockerhub
Diffstat (limited to 'kokoro/linux/pull_request_in_docker.sh')
| -rwxr-xr-x | kokoro/linux/pull_request_in_docker.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kokoro/linux/pull_request_in_docker.sh b/kokoro/linux/pull_request_in_docker.sh index 10daf0a5..fa5f0caa 100755 --- a/kokoro/linux/pull_request_in_docker.sh +++ b/kokoro/linux/pull_request_in_docker.sh @@ -5,7 +5,7 @@ WORKSPACE_BASE=`pwd` MY_DIR="$(dirname "$0")" -TEST_SCRIPT=$MY_DIR/../tests.sh +TEST_SCRIPT=$MY_DIR/../../tests.sh BUILD_DIR=/tmp/protobuf set -e # exit immediately on error @@ -16,7 +16,7 @@ set -x # display all commands rm -rf $BUILD_DIR mkdir -p $BUILD_DIR cd $BUILD_DIR -git clone /var/local/jenkins/protobuf +git clone /var/local/kokoro/protobuf cd protobuf # Set up the directory where our test output is going to go. @@ -54,7 +54,7 @@ parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT ::: cat $OUTPUT_DIR/joblog -# The directory that is copied from Docker back into the Jenkins workspace. +# The directory that is copied from Docker back into the Kokoro workspace. COPY_FROM_DOCKER=/var/local/git/protobuf/testoutput mkdir -p $COPY_FROM_DOCKER TESTOUTPUT_XML_FILE=$COPY_FROM_DOCKER/testresults.xml |