From 7412efbaf5da3c34982d0e4b1f378f3629ebe3d2 Mon Sep 17 00:00:00 2001 From: Michael Kotliar Date: Wed, 8 Jul 2020 01:26:58 -0400 Subject: [PATCH] Split travis into two jobs --- .travis.yml | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index c23dfb8..aa298f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,31 +11,31 @@ services: python: - 3.7 -before_install: -- git clone https://github.com/datirium/workflows.git --recursive -- docker pull mysql/mysql-server:5.7 -- docker run -v ~/database:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=airflow -e MYSQL_DATABASE=airflow -e MYSQL_USER=airflow -e MYSQL_PASSWORD=airflow -p 6603:3306 -d mysql/mysql-server:5.7 --explicit-defaults-for-timestamp=1 - -install: -- pip install mysqlclient -- pip install . - -before_script: -- cwl-airflow init -- sed -i'.backup' -e 's/^executor.*/executor = LocalExecutor/g' ~/airflow/airflow.cfg -- sed -i'.backup' -e 's/^dag_dir_list_interval =.*/dag_dir_list_interval = 60/g' ~/airflow/airflow.cfg -- sed -i'.backup' -e 's/^parallelism =.*/parallelism = 1/g' ~/airflow/airflow.cfg -- sed -i'.backup' -e 's/^sql_alchemy_conn.*/sql_alchemy_conn = mysql:\/\/airflow:airflow@127.0.0.1:6603\/airflow/g' ~/airflow/airflow.cfg -- airflow scheduler > /dev/null 2>&1 & -- cwl-airflow api > /dev/null 2>&1 & - - -script: -- ./tests/run_tests.sh -- cwl-airflow test --suite workflows/tests/conformance_tests.yaml --spin --range 1 - -after_success: -- coveralls +jobs: + include: + - name: Unit tests + install: + - pip install . + script: ./tests/run_tests.sh + after_success: + - coveralls + - name: SciDAP workflow tests + before_install: + - git clone https://github.com/datirium/workflows.git --recursive + - docker pull mysql/mysql-server:5.7 + - docker run -v ~/database:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=airflow -e MYSQL_DATABASE=airflow -e MYSQL_USER=airflow -e MYSQL_PASSWORD=airflow -p 6603:3306 -d mysql/mysql-server:5.7 --explicit-defaults-for-timestamp=1 + install: + - pip install mysqlclient + - pip install . + before_script: + - cwl-airflow init + - sed -i'.backup' -e 's/^executor.*/executor = LocalExecutor/g' ~/airflow/airflow.cfg + - sed -i'.backup' -e 's/^dag_dir_list_interval =.*/dag_dir_list_interval = 60/g' ~/airflow/airflow.cfg + - sed -i'.backup' -e 's/^parallelism =.*/parallelism = 1/g' ~/airflow/airflow.cfg + - sed -i'.backup' -e 's/^sql_alchemy_conn.*/sql_alchemy_conn = mysql:\/\/airflow:airflow@127.0.0.1:6603\/airflow/g' ~/airflow/airflow.cfg + - airflow scheduler > /dev/null 2>&1 & + - cwl-airflow api > /dev/null 2>&1 & + script: cwl-airflow test --suite workflows/tests/conformance_tests.yaml --spin --range 1 branches: only: