Prepare chado and site

.travis.yml

@@ -18,9 +18,13 @@ script:
   # Test tripal 3 installation
   - docker run -it -d --rm --name tripal3 -v "$(pwd)":/modules/tripal statonlab/drupal7
   - sleep 10
-  - docker exec -it tripal3 drush en -y tripal tripal_chado tripal_chado_views tripal_bulk_loader tripal_daemon tripal_ds tripal_ws
-  # Prepare Drupal and Chado
-
+  - docker exec -it tripal3 drush en -y tripal tripal_chado tripal_chado_views tripal_daemon tripal_ds tripal_ws
+  # Prepare Chado
+  - docker exec -it tripal3 drush eval "module_load_include('inc', 'tripal_chado', 'includes/tripal_chado.install'); tripal_chado_load_drush_submit('Install Chado v1.3');"
+  - docker exec -it tripal3 drush trp-run-jobs --username=tripal
+  # Prepare Drupal
+  - docker exec -it tripal3 drush eval "module_load_include('inc', 'tripal_chado', 'includes/setup/tripal_chado.setup'); tripal_chado_prepare_drush_submit();"
+  - docker exec -it tripal3 drush trp-run-jobs --username=tripal
   # Run PHPUnit tests
   - docker exec -it tripal3 bash -c "cd /modules/tripal && composer install && DRUPAL_ROOT=/var/www/html ./vendor/bin/phpunit"
   # Test Tripal 2 installation
@@ -28,6 +32,6 @@ script:
   - docker run -it -d --rm --name tripal2 -v "$(pwd)":/modules/tripal statonlab/drupal7
   - sleep 10
   - docker exec -it tripal2 drush en -y tripal
-  - docker exec -it tripal2 bash -c 'drush pm-disable tripal_core -y'
+  - docker exec -it tripal2 drush pm-disable tripal_core -y
   - git checkout $BRANCH
   - docker exec -it tripal2 drush en -y tripal