Fixed SOURCE_BRANCH set by tag names (#8562)

SOURCE_BRANCH was set to TAG_NAME in Dockerhub. Now that we changed
DockerHub to build from tags, it caused AIRFLOW_BRANCH arg
to be set to master-nightly instead of master and we had a cache
miss.

SOURCE_BRANCH variable is not realy needed any more. Removed it
This commit is contained in:
Jarek Potiuk 2020-04-26 17:24:58 +02:00 коммит произвёл GitHub
Родитель 3c4ca62af1
Коммит df19d9b00c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 2 добавлений и 6 удалений

Просмотреть файл

@ -27,9 +27,5 @@ export DOCKERHUB_USER=${DOCKERHUB_USER:="apache"}
# own docker images. In this case you can build images locally and push them # own docker images. In this case you can build images locally and push them
export DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"} export DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"}
# if BRANCH_NAME is not set it will be set to either SOURCE_BRANCH
# (if overridden by configuration) or default branch configured in /common/_default_branch.sh
export SOURCE_BRANCH=${SOURCE_BRANCH:=${DEFAULT_BRANCH}}
# read branch name from what has been set from sources (It can also be overridden) # read branch name from what has been set from sources (It can also be overridden)
export BRANCH_NAME=${BRANCH_NAME:=${SOURCE_BRANCH}} export BRANCH_NAME=${BRANCH_NAME:=${DEFAULT_BRANCH}}

Просмотреть файл

@ -20,6 +20,7 @@
# on CI to potentially rebuild (and refresh layers that # on CI to potentially rebuild (and refresh layers that
# are not cached) Docker images that are used to run CI jobs # are not cached) Docker images that are used to run CI jobs
export FORCE_ANSWER_TO_QUESTIONS="yes" export FORCE_ANSWER_TO_QUESTIONS="yes"
export VERBOSE_COMMANDS="true"
if [[ -z ${DOCKER_REPO} ]]; then if [[ -z ${DOCKER_REPO} ]]; then
echo echo

Просмотреть файл

@ -31,7 +31,6 @@ services:
- MINICLUSTER_HOME=/opt/minicluster - MINICLUSTER_HOME=/opt/minicluster
- CELERY_BROKER_URLS=amqp://guest:guest@rabbitmq:5672,redis://redis:6379/0 - CELERY_BROKER_URLS=amqp://guest:guest@rabbitmq:5672,redis://redis:6379/0
- BACKEND - BACKEND
- SOURCE_BRANCH
- CI - CI
- CI_BUILD_ID - CI_BUILD_ID
- CI_JOB_ID - CI_JOB_ID