From 783b94cd4d2dba558bf85271561dc21ec6da16f8 Mon Sep 17 00:00:00 2001
From: dvanaken <dvanaken@cs.cmu.edu>
Date: Thu, 5 Dec 2019 09:56:27 -0500
Subject: [PATCH] Speedup travis-ci tests

---
 .travis.yml                                   | 50 ++++++++++++++++---
 server/website/website/settings/constants.py  |  3 ++
 server/website/website/tasks/async_tasks.py   |  1 -
 .../website/website/tasks/periodic_tasks.py   |  5 +-
 4 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 858b089..cfa3237 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ matrix:
         repo: cmu-db/ottertune
         branch: master
 
-  - name: Tests (MySQL v5.7)
+  - name: Unit Tests (MySQL v5.7)
     env:
     - BACKEND=mysql
     services:
@@ -76,8 +76,9 @@ matrix:
     before_install:
     - mysql -e "CREATE DATABASE IF NOT EXISTS ${DB_NAME}"
     - sed -i '/psycopg2/d' $WEB/requirements.txt
+    - echo "codecov" >> $WEB/requirements.txt
 
-  - name: Tests (PostgreSQL v9.6)
+  - name: Unit Tests (PostgreSQL v9.6)
     env:
     - BACKEND=postgresql
     addons:
@@ -92,9 +93,49 @@ matrix:
     before_install:
     - psql -U postgres -c "CREATE DATABASE ${DB_NAME}"
     - sed -i '/mysqlclient/d' $WEB/requirements.txt
+    - echo "codecov" >> $WEB/requirements.txt
+
+  - name: Integration Tests (MySQL v5.7)
+    env:
+    - BACKEND=mysql
+    services:
+    - mysql
+    addons:
+      apt:
+        update: true
+        packages:
+        - mysql-server
+        - python-mysqldb
+        - rabbitmq-server
+    before_install:
+    - mysql -e "CREATE DATABASE IF NOT EXISTS ${DB_NAME}"
+    - sed -i '/psycopg2/d' $WEB/requirements.txt
+    - sed -i 's/^RUN_EVERY =.*$/RUN_EVERY = 60/' $WEB/website/settings/constants.py
+    script:
+    - cd $WEB && python manage.py runserver 0.0.0.0:8000 &
+    - sleep 10 && cd $DRIVER && fab integration_tests
+    after_success: []
+
+  - name: Integration Tests (PostgreSQL v9.6)
+    env:
+    - BACKEND=postgresql
+    addons:
+      postgresql: "9.6"
+      apt:
+        update: true
+        packages:
+        - rabbitmq-server
+    before_install:
+    - psql -U postgres -c "CREATE DATABASE ${DB_NAME}"
+    - sed -i '/mysqlclient/d' $WEB/requirements.txt
+    - sed -i 's/^RUN_EVERY =.*$/RUN_EVERY = 60/' $WEB/website/settings/constants.py
+    script:
+    - cd $WEB && python manage.py runserver 0.0.0.0:8000 &
+    - sleep 10 && cd $DRIVER && fab integration_tests
+    after_success: []
 
 install:
-- pip install codecov -r $WEB/requirements.txt
+- pip install -r $WEB/requirements.txt
 - pip freeze
 before_script:
 - env | sort
@@ -110,9 +151,6 @@ script:
 - cd $ROOT/server && coverage run --omit="*/tests/*" -m unittest discover -s analysis/tests -v
 - cd $WEB && coverage run manage.py test --noinput -v 2
 - cd $CONTROLLER && gradle build
-- cd $WEB
-- python manage.py runserver 0.0.0.0:8000 &
-- sleep 10 && cd $DRIVER && fab integration_tests
 - cd $ROOT && git reset --soft ${TRAVIS_COMMIT_RANGE%...*} && git status && git
   log | head -n 1 && git lint
 after_success:
diff --git a/server/website/website/settings/constants.py b/server/website/website/settings/constants.py
index f00becd..9abfc34 100644
--- a/server/website/website/settings/constants.py
+++ b/server/website/website/settings/constants.py
@@ -5,6 +5,9 @@
 #
 
 # ---PIPELINE CONSTANTS---
+#  how often to run the background tests, in seconds
+RUN_EVERY = 300
+
 #  the number of samples (staring points) in gradient descent
 NUM_SAMPLES = 30
 
diff --git a/server/website/website/tasks/async_tasks.py b/server/website/website/tasks/async_tasks.py
index ff4d1d1..5743007 100644
--- a/server/website/website/tasks/async_tasks.py
+++ b/server/website/website/tasks/async_tasks.py
@@ -107,7 +107,6 @@ class ConfigurationRecommendation(UpdateTask):  # pylint: disable=abstract-metho
     def on_success(self, retval, task_id, args, kwargs):
         super(ConfigurationRecommendation, self).on_success(retval, task_id, args, kwargs)
 
-        LOG.info("NEXT CONFIG: %s", retval['recommendation'])
         result_id = retval['result_id']
         result = Result.objects.get(pk=result_id)
 
diff --git a/server/website/website/tasks/periodic_tasks.py b/server/website/website/tasks/periodic_tasks.py
index 983981d..670bea8 100644
--- a/server/website/website/tasks/periodic_tasks.py
+++ b/server/website/website/tasks/periodic_tasks.py
@@ -18,6 +18,7 @@ from analysis.preprocessing import (Bin, get_shuffle_indices,
                                     DummyEncoder,
                                     consolidate_columnlabels)
 from website.models import PipelineData, PipelineRun, Result, Workload
+from website.settings import RUN_EVERY
 from website.types import PipelineTaskType, WorkloadStatusType
 from website.utils import DataUtil, JSONUtil
 
@@ -27,8 +28,8 @@ LOG = get_task_logger(__name__)
 MIN_WORKLOAD_RESULTS_COUNT = 5
 
 
-# Run the background tasks every 5 minutes
-@periodic_task(run_every=300, name="run_background_tasks")
+# Run the background tasks every 'RUN_EVERY' seconds
+@periodic_task(run_every=RUN_EVERY, name="run_background_tasks")
 def run_background_tasks():
     LOG.debug("Starting background tasks")
     # Find modified and not modified workloads, we only have to calculate for the