fix has-matching-changes to reflect latest script changes

Author: knakad

buildspec.yml

@@ -46,23 +46,11 @@ phases:
         tox -e py27,py36,stats -- tests/
 
       # spark integration tests
-      - cd $CODEBUILD_SRC_DIR/sagemaker-spark-sdk
-      - HAS_MATCHING_CHANGES_OUTPUT=$(has-matching-changes "src/" "test/" "build.sbt")
-      - |
-        if [ "$HAS_MATCHING_CHANGES" = "Changes Found" ] ; then
-          cd $CODEBUILD_SRC_DIR/integration-tests/sagemaker-spark-sdk
-          sbt -Dsbt.log.noformat=true it:test
-        else
-          echo "skipping spark integration tests"
-        fi
+      - cd $CODEBUILD_SRC_DIR/integration-tests/sagemaker-spark-sdk
+      - test_cmd="sbt -Dsbt.log.noformat=true it:test"
+      - execute-command-if-has-matching-changes "$test_cmd" "src/" "test/" "build.sbt"
 
       # pyspark integration tests
       - cd $CODEBUILD_SRC_DIR/sagemaker-pyspark-sdk
-      - HAS_MATCHING_CHANGES_OUTPUT=$(has-matching-changes "src/" "tests/" "setup.*" "requirements.txt" "tox.ini)
-      - |
-        if [ "$HAS_MATCHING_CHANGES" = "Changes Found" ] ; then
-          IGNORE_COVERAGE=- \
-          tox -e py36 -- $CODEBUILD_SRC_DIR/integration-tests/sagemaker-pyspark-sdk/tests/ -n 10 --boxed --reruns 2
-        else
-          echo "skipping pyspark integration tests"
-        fi
+      - test_cmd="IGNORE_COVERAGE=- && tox -e py36 -- $CODEBUILD_SRC_DIR/integration-tests/sagemaker-pyspark-sdk/tests/ -n 10 --boxed --reruns 2"
+      - execute-command-if-has-matching-changes "$test_cmd" "src/" "tests/" "setup.*" "requirements.txt" "tox.ini"