Fix git diff in test upload job (#24560)

* fix git diff in test upload job

* this is a test

* Revert "this is a test"

This reverts commit 9aa526f.

* added script that checks whether to trigger test upload

* fix

* debugging

* debugging

* revert prints

Author: yaakovpraisler

.gitlab/ci/on-push.yml

@@ -505,16 +505,15 @@ test-upload-flow:
   rules:
     - if: '$CI_PIPELINE_SOURCE =~ /^(push|contrib)$/'
   variables:
-    CURRENT_BRANCH: "$CI_COMMIT_BRANCH"
     ALL_BUCKETS: "$GCS_MARKET_BUCKET_DEV,$GCS_MARKET_V2_BUCKET_DEV"
   stage: unittests-and-validations
   allow_failure: true
   script:
     - |
-      if ! $(git diff origin/master $CI_COMMIT_BRANCH --name-only | grep -q "Tests/\|Utils/") ; then
-        echo "No upload related files were modified, skipping upload test "
-        exit 0
-      fi
+    - section_start "Checks Whether to Trigger a Test Upload"
+    - ./Utils/should_trigger_test_upload.sh
+    - section_end "Checks Whether to Trigger a Test Upload"
+
     - section_start "Create Testing Branch"
     - export BRANCH="${CI_COMMIT_BRANCH}-upload_test_branch-$(date +%s)"
     - python3 ./Utils/test_upload_flow/create_test_branch.py -tb $BRANCH -a $ARTIFACTS_FOLDER -g $GITLAB_PUSH_TOKEN

Utils/should_trigger_test_upload.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+DIFF_FILES_LIST=$(git diff origin/master...$CI_COMMIT_BRANCH --name-only)
+IGNORED_FILES=(
+    "Tests/conf.json"
+    "Tests/known_words.txt"
+)
+
+for i in "${IGNORED_FILES[@]}"; do
+    DIFF_FILES_LIST=${DIFF_FILES_LIST[*]/$i} 
+done
+
+SHOULD_SKIP_TEST=$(echo "${DIFF_FILES_LIST[*]}" | grep "Tests/\|Utils/")
+
+if [ -z "$SHOULD_SKIP_TEST" ] ; then
+    echo "No upload-flow related files were modified, skipping upload test"
+    exit 0
+fi
+
+echo "Found modified files that should be tested in upload-flow"