[AIRFLOW-3168] More resillient database use in CI (apache#4014)

Author: dima-asana

scripts/ci/3-setup-databases.sh scripts/ci/3-setup-mysql.sh

@@ -20,4 +20,11 @@ set -exuo pipefail
 
 MYSQL_HOST=mysql
 
-mysql -h ${MYSQL_HOST} -u root -e 'drop database if exists airflow; create database airflow'
+retries=3
+for ((i=0; i<retries; i++)); do
+    mysql -h ${MYSQL_HOST} -u root -e 'drop database if exists airflow; create database airflow' && exit 0
+    echo "mysql db creation did not succeed, waiting 5 seconds to retry"
+    sleep 5
+done
+
+echo "mysql db creation could not succeed" && exit 1

scripts/ci/airflow_travis.cfg

@@ -21,7 +21,7 @@ airflow_home = ~/airflow
 dags_folder = ~/airflow/dags
 base_log_folder = ~/airflow/logs
 executor = LocalExecutor
-sql_alchemy_conn = mysql://root@mysql/airflow
+sql_alchemy_conn = # overridden by tox.ini
 unit_test_mode = True
 load_examples = True
 donot_pickle = False
@@ -56,7 +56,7 @@ celery_app_name = airflow.executors.celery_executor
 worker_concurrency = 16
 worker_log_server_port = 8793
 broker_url = amqp://guest:guest@rabbitmq:5672/
-result_backend = db+mysql://root@mysql/airflow
+result_backend = # overridden by tox.ini
 flower_port = 5555
 default_queue = default
 

tests/configuration.py

@@ -221,4 +221,9 @@ def test_deprecated_options_cmd(self):
         conf.set('celery', 'celery_result_backend_cmd', '/bin/echo 99')
 
         with self.assertWarns(DeprecationWarning):
+            tmp = None
+            if 'AIRFLOW__CELERY__RESULT_BACKEND' in os.environ:
+                tmp = os.environ.pop('AIRFLOW__CELERY__RESULT_BACKEND')
             self.assertEquals(conf.getint('celery', 'result_backend'), 99)
+            if tmp:
+                os.environ['AIRFLOW__CELERY__RESULT_BACKEND'] = tmp

tests/executors/test_celery_executor.py

@@ -24,11 +24,16 @@
 from airflow.executors.celery_executor import app
 from airflow.utils.state import State
 
+from airflow import configuration
+configuration.load_test_config()
+
 # leave this it is used by the test worker
 import celery.contrib.testing.tasks  # noqa: F401
 
 
 class CeleryExecutorTest(unittest.TestCase):
+    @unittest.skipIf('sqlite' in configuration.conf.get('core', 'sql_alchemy_conn'),
+                     "sqlite is configured with SequentialExecutor")
     def test_celery_integration(self):
         executor = CeleryExecutor()
         executor.start()

tox.ini

@@ -44,7 +44,9 @@ setenv =
   KRB5_CONFIG=/etc/krb5.conf
   KRB5_KTNAME=/etc/airflow.keytab
   backend_mysql: AIRFLOW__CORE__SQL_ALCHEMY_CONN=mysql://root@mysql/airflow
+  backend_mysql: AIRFLOW__CELERY__RESULT_BACKEND=db+mysql://root@mysql/airflow
   backend_postgres: AIRFLOW__CORE__SQL_ALCHEMY_CONN=postgresql+psycopg2://postgres:airflow@postgres/airflow
+  backend_postgres: AIRFLOW__CELERY__RESULT_BACKEND=db+postgresql://postgres:airflow@postgres/airflow
   backend_sqlite: AIRFLOW__CORE__SQL_ALCHEMY_CONN=sqlite:///{homedir}/airflow.db
   backend_sqlite: AIRFLOW__CORE__EXECUTOR=SequentialExecutor
 
@@ -55,7 +57,7 @@ commands =
   pip install --progress-bar off --find-links={homedir}/.wheelhouse --no-index -e .[devel_ci]
   env_docker: {toxinidir}/scripts/ci/1-setup-env.sh
   env_docker: {toxinidir}/scripts/ci/2-setup-kdc.sh
-  env_docker: {toxinidir}/scripts/ci/3-setup-databases.sh
+  backend_mysql: {toxinidir}/scripts/ci/3-setup-mysql.sh
   {toxinidir}/scripts/ci/5-run-tests.sh []
   {toxinidir}/scripts/ci/6-check-license.sh
   codecov -e TOXENV