[AIRFLOW-5365] No need to do image rebuild when switching master/v1-1…

…0-test (#5972)

(cherry picked from commit 319b804)

scripts/ci/_utils.sh

@@ -158,10 +158,11 @@ function create_cache_directory() {
 function check_file_md5sum {
     local FILE="${1}"
     local MD5SUM
-    mkdir -pv "${BUILD_CACHE_DIR}/${THE_IMAGE_TYPE}"
+    local MD5SUM_CACHE_DIR="${BUILD_CACHE_DIR}/${DEFAULT_BRANCH}/${THE_IMAGE_TYPE}"
+    mkdir -pv "${MD5SUM_CACHE_DIR}"
     MD5SUM=$(md5sum "${FILE}")
     local MD5SUM_FILE
-    MD5SUM_FILE=${BUILD_CACHE_DIR}/${THE_IMAGE_TYPE}/$(basename "${FILE}").md5sum
+    MD5SUM_FILE="${MD5SUM_CACHE_DIR}"/$(basename "${FILE}").md5sum
     local MD5SUM_FILE_NEW
     MD5SUM_FILE_NEW=${CACHE_TMP_FILE_DIR}/$(basename "${FILE}").md5sum.new
     echo "${MD5SUM}" > "${MD5SUM_FILE_NEW}"
@@ -187,8 +188,9 @@ function check_file_md5sum {
 function move_file_md5sum {
     local FILE="${1}"
     local MD5SUM_FILE
-    mkdir -pv "${BUILD_CACHE_DIR}/${THE_IMAGE_TYPE}"
-    MD5SUM_FILE=${BUILD_CACHE_DIR}/${THE_IMAGE_TYPE}/$(basename "${FILE}").md5sum
+    local MD5SUM_CACHE_DIR="${BUILD_CACHE_DIR}/${DEFAULT_BRANCH}/${THE_IMAGE_TYPE}"
+    mkdir -pv "${MD5SUM_CACHE_DIR}"
+    MD5SUM_FILE="${MD5SUM_CACHE_DIR}"/$(basename "${FILE}").md5sum
     local MD5SUM_FILE_NEW
     MD5SUM_FILE_NEW=${CACHE_TMP_FILE_DIR}/$(basename "${FILE}").md5sum.new
     if [[ -f "${MD5SUM_FILE_NEW}" ]]; then
@@ -214,7 +216,8 @@ function update_all_md5_files() {
     if [[ -n ${PYTHON_VERSION:=""} ]]; then
         SUFFIX="_${PYTHON_VERSION}"
     fi
-    touch "${BUILD_CACHE_DIR}/.built_${THE_IMAGE_TYPE}${SUFFIX}"
+    mkdir -pv "${BUILD_CACHE_DIR}/${DEFAULT_BRANCH}"
+    touch "${BUILD_CACHE_DIR}/${DEFAULT_BRANCH}/.built_${THE_IMAGE_TYPE}${SUFFIX}"
 }
 
 #
@@ -382,7 +385,7 @@ EOF
         print_info
         export AIRFLOW_CONTAINER_FORCE_PULL_IMAGES="false"
         export AIRFLOW_CONTAINER_DOCKER_BUILD_NEEDED="true"
-    elif [[ -f "${BUILD_CACHE_DIR}/.built_${THE_IMAGE_TYPE}_${PYTHON_VERSION}" ]]; then
+    elif [[ -f "${BUILD_CACHE_DIR}/${DEFAULT_BRANCH}/.built_${THE_IMAGE_TYPE}_${PYTHON_VERSION}" ]]; then
         print_info
         print_info "Image ${THE_IMAGE_TYPE} built locally - skip force-pulling"
         print_info