zentol commented on a change in pull request #32: URL: https://github.com/apache/flink-docker/pull/32#discussion_r462539917
########## File path: testing/run_travis_tests.sh ########## @@ -11,14 +11,25 @@ fi BRANCH="$TRAVIS_BRANCH" -./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-1.11-SNAPSHOT-bin-hadoop2.tgz"; - -if [ -z "$IS_PULL_REQUEST" ] && [ "$BRANCH" = "dev-master" ]; then +function run_tests { + if [ -z "$IS_PULL_REQUEST" ] && [ "$BRANCH" = "dev-master" ]; then Review comment: this file is indented with spaces ########## File path: testing/run_travis_tests.sh ########## @@ -11,14 +11,25 @@ fi BRANCH="$TRAVIS_BRANCH" -./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-1.11-SNAPSHOT-bin-hadoop2.tgz"; - -if [ -z "$IS_PULL_REQUEST" ] && [ "$BRANCH" = "dev-master" ]; then +function run_tests { + if [ -z "$IS_PULL_REQUEST" ] && [ "$BRANCH" = "dev-master" ]; then smoke_test_all_images smoke_test_one_image_non_root else # For pull requests and branches, test one image smoke_test_one_image fi +} + +./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-1.11-SNAPSHOT-bin-hadoop2.tgz"; +run_tests + +rm -r dev Review comment: Alternatively, you can give the custom builds a name (using `-n`), build both, and then just run `smoke_test_all_images`. This whole setup of running 1 image per PR was imo mostly relevant for the previous setup where tests ran on the master branch with many images sitting in the branch. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
