Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Sep 3, 2019
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions scripts/ci/_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,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}"
Expand All @@ -192,8 +193,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
Expand All @@ -219,7 +221,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}"
}

#
Expand Down Expand Up @@ -396,7 +399,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
Expand Down