Skip to content

Commit

Permalink
Bring back reset db explicitly called at CI entry (#7798)
Browse files Browse the repository at this point in the history
* Fix elasticsearch breaking the build

* Bring back reset db explicitly called at CI entry
  • Loading branch information
potiuk committed Mar 21, 2020
1 parent b7ca0dd commit 9ad1844
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -26,6 +26,7 @@ env:
- MOUNT_HOST_AIRFLOW_VOLUME="true"
- FORCE_ANSWER_TO_QUESTIONS="yes"
- SKIP_CHECK_REMOTE_IMAGE="true"
- DB_RESET="true"
- VERBOSE="true"
- CI="true"
python: "3.6"
Expand Down
11 changes: 6 additions & 5 deletions scripts/ci/in_container/entrypoint_ci.sh
Expand Up @@ -57,6 +57,12 @@ ARGS=( "$@" )
RUN_TESTS=${RUN_TESTS:="true"}
INSTALL_AIRFLOW_VERSION="${INSTALL_AIRFLOW_VERSION:=""}"

if [[ ${AIRFLOW_VERSION} == *1.10* || ${INSTALL_AIRFLOW_VERSION} == *1.10* ]]; then
export RUN_AIRFLOW_1_10="true"
else
export RUN_AIRFLOW_1_10="false"
fi

if [[ ${INSTALL_AIRFLOW_VERSION} == "current" ]]; then
if [[ ! -d "${AIRFLOW_SOURCES}/airflow/www/node_modules" ]]; then
echo
Expand Down Expand Up @@ -85,11 +91,6 @@ if [[ ${INSTALL_AIRFLOW_VERSION} == "current" ]]; then
mkdir -p "${AIRFLOW_SOURCES}"/tmp/
export PYTHONPATH=${AIRFLOW_SOURCES}
else
if [[ ${AIRFLOW_VERSION} == *1.10* || ${INSTALL_AIRFLOW_VERSION} == *1.10* ]]; then
export RUN_AIRFLOW_1_10="true"
else
export RUN_AIRFLOW_1_10="false"
fi
install_released_airflow_version "${INSTALL_AIRFLOW_VERSION}"
fi

Expand Down

0 comments on commit 9ad1844

Please sign in to comment.