diff --git a/.kokoro/tests/diff_tests.sh b/.kokoro/tests/diff_tests.sh index 5e15cf1ba1e..e1819e2aaa9 100755 --- a/.kokoro/tests/diff_tests.sh +++ b/.kokoro/tests/diff_tests.sh @@ -19,7 +19,7 @@ shopt -s globstar trap '' HUP # Update gcloud and check version -gcloud components update --quiet +gcloud components update --quiet 1> /dev/null echo -e "\n ********** GCLOUD INFO *********** \n" gcloud -v echo -e "\n ********** MAVEN INFO *********** \n" @@ -27,7 +27,7 @@ mvn -v echo -e "\n ********** GRADLE INFO *********** " gradle -v -# Setup required enviormental variables +# Setup required environmental variables export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing source ${KOKORO_GFILE_DIR}/aws-secrets.sh @@ -37,35 +37,36 @@ gcloud auth activate-service-account\ --key-file=$GOOGLE_APPLICATION_CREDENTIALS \ --project=$GOOGLE_CLOUD_PROJECT -echo -e "\n******************** CHECKING FOR AFFECTED FOLDERS ********************" +echo -e "\n******************** TESTING AFFECTED PROJECTS ********************" # Diff to find out what has changed from master cd github/java-docs-samples -find ./*/ -name pom.xml -print0 | sort -z | while read -d $'\0' file +find * -name pom.xml -print0 | sort -z | while read -d $'\0' file do + # Navigate to project file=$(dirname "$file") - echo "------------------------------------------------------------" - echo "- checking $file" - echo "------------------------------------------------------------" - - pushd "$file" > /dev/null + set +e + # Only tests changed projects git diff --quiet master.. . - RTN=$? + CHANGED=$? + # Only test leafs to prevent testing twice + PARENT=$(grep "" pom.xml -c) set -e # Check for changes to the current folder - if [ "$RTN" -eq 1 ]; then - echo -e "\n Change detected. Running tests. \n " + if [ "$CHANGED" -eq 1 ] && [ "$PARENT" -eq 0 ]; then + echo "------------------------------------------------------------" + echo "- testing $file" + echo "------------------------------------------------------------" + mvn -q --batch-mode --fail-at-end clean verify \ -Dfile.encoding="UTF-8" \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dmaven.test.redirectTestOutputToFile=true \ -Dbigtable.projectID="${GOOGLE_CLOUD_PROJECT}" \ -Dbigtable.instanceID=instance - echo -e " Tests complete. \n" - else - echo -e "\n NO change found. \n" + echo -e "\n Tests complete. \n" fi popd > /dev/null diff --git a/appengine-java8/bigtable/pom.xml b/appengine-java8/bigtable/pom.xml index 132cd4d7831..9013f11de05 100644 --- a/appengine-java8/bigtable/pom.xml +++ b/appengine-java8/bigtable/pom.xml @@ -46,7 +46,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 1.1.1 + 1.1.2