diff --git a/.travis.yml b/.travis.yml index f5899e3bd6..b8a1b30f65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,16 @@ matrix: include: - name: "Python 3.6 MariaDB" python: 3.6 - env: DB=MariaDB + env: DB=mariadb - name: "Python 3.6 PostgreSQL" python: 3.6 - env: DB=PostgreSQL + env: DB=postgres - name: "Cypress" python: 3.6 - env: DB=MariaDB + env: DB=mariadb - name: "Python 2.7 MariaDB" python: 2.7 - env: DB=MariaDB + env: DB=mariadb install: - cd ~ @@ -38,7 +38,9 @@ install: - pip install -e ./bench - bench init frappe-bench --skip-assets --python $(which python) --frappe-path $TRAVIS_BUILD_DIR - - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/ + + - mkdir ~/frappe-bench/sites/test_site + - cp $TRAVIS_BUILD_DIR/test_sites/$DB.json ~/frappe-bench/sites/test_site/site_config.json - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" diff --git a/test_sites/mariadb.json b/test_sites/mariadb.json new file mode 100644 index 0000000000..550ad94769 --- /dev/null +++ b/test_sites/mariadb.json @@ -0,0 +1,14 @@ +{ + "db_host": "localhost", + "db_name": "test_frappe", + "db_password": "test_frappe", + "db_type": "mariadb", + "auto_email_id": "test@example.com", + "mail_server": "smtp.example.com", + "mail_login": "test@example.com", + "mail_password": "test", + "admin_password": "admin", + "root_login": "root", + "root_password": "travis", + "host_name": "http://test_site:8000" +} diff --git a/test_sites/postgres.json b/test_sites/postgres.json new file mode 100644 index 0000000000..619dd91f10 --- /dev/null +++ b/test_sites/postgres.json @@ -0,0 +1,14 @@ +{ + "db_host": "localhost", + "db_name": "test_frappe", + "db_password": "test_frappe", + "db_type": "postgres", + "auto_email_id": "test@example.com", + "mail_server": "smtp.example.com", + "mail_login": "test@example.com", + "mail_password": "test", + "admin_password": "admin", + "root_login": "postgres", + "root_password": "travis", + "host_name": "http://test_site:8000" +}