Merge pull request #147 from edx/feanil/analytics-api-16.04

Moving to running analytics tests on 16.04

Author: feanil

.travis.yml

@@ -1,20 +1,18 @@
 language: python
-python: "2.7"
-install:
-    - "pip install coveralls"
-    - "make test.install_elasticsearch"
-cache: pip
-# Use docker for builds
-sudo: false
-before_script:
-    - make test.run_elasticsearch
-    # Recommended by Travis in order to make sure ElasticSearch
-    # actually starts up.  See # https://docs.travis-ci.com/user/database-setup/#ElasticSearch
-    - sleep 10
+python:
+  - "2.7"
+
+services:
+  - docker
+sudo: required
+
+before_install:
+  - docker-compose -f .travis/docker-compose-travis.yml up -d
+
 script:
-    - make validate
-    - git fetch origin master:refs/remotes/origin/master # https://github.com/edx/diff-cover#troubleshooting
-    - make diff.report
+  - docker exec analytics_api_testing /edx/app/analytics_api/analytics_api/.travis/run_tests.sh
+
 after_success:
-    - coveralls
-    - bash ./scripts/build-stats-to-datadog.sh
+  - pip install -U codecov
+  - docker exec analytics_api_testing /edx/app/analytics_api/analytics_api/.travis/run_coverage.sh
+  - codecov

.travis/docker-compose-travis.yml

@@ -0,0 +1,20 @@
+version: "2"
+
+services:
+  analytics_api:
+    image: edxops/analytics_api:latest
+    container_name: analytics_api_testing
+    volumes:
+      - ..:/edx/app/analytics_api/analytics_api
+    command: tail -f /dev/null
+    environment:
+      ELASTICSEARCH_LEARNERS_HOST: 'http://es:9200/'
+      # Pull these from the host environment.
+      TRAVIS_BRANCH:
+      TRAVIS_PULL_REQUEST:
+      DATADOG_API_KEY:
+    depends_on:
+      - "es"
+  es:
+    image: elasticsearch:1.5.2
+    container_name: es

.travis/run_coverage.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -xe
+. /edx/app/analytics_api/venvs/analytics_api/bin/activate
+
+cd /edx/app/analytics_api/analytics_api
+
+make diff.report
+coverage xml
+bash ./scripts/build-stats-to-datadog.sh

.travis/run_tests.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -xe
+. /edx/app/analytics_api/venvs/analytics_api/bin/activate
+
+cd /edx/app/analytics_api/analytics_api
+
+make validate

README.rst

@@ -91,5 +91,5 @@ will make your contribution more likely to be accepted.
 
 .. |build-status| image:: https://travis-ci.org/edx/edx-analytics-data-api.svg?branch=master
    :target: https://travis-ci.org/edx/edx-analytics-data-api
-.. |coverage-status| image:: https://coveralls.io/repos/edx/edx-analytics-data-api/badge.png?branch=master
-   :target: https://coveralls.io/r/edx/edx-analytics-data-api?branch=master
+.. |coverage-status| image:: https://img.shields.io/codecov/c/github/edx/edx-analytics-data-api/master.svg
+   :target: https://codecov.io/gh/edx/edx-analytics-data-api

analyticsdataserver/settings/test.py

@@ -26,7 +26,7 @@
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Default elasticsearch port when running locally
-ELASTICSEARCH_LEARNERS_HOST = 'http://localhost:9223/'
+ELASTICSEARCH_LEARNERS_HOST = environ.get("ELASTICSEARCH_LEARNERS_HOST", 'http://localhost:9223/')
 ELASTICSEARCH_LEARNERS_INDEX = 'roster_test'
 ELASTICSEARCH_LEARNERS_UPDATE_INDEX = 'index_update_test'