Standardize naming of CI variables

All are now called CI_* instead of DJANGO_*, DO_* and TRAVIS_*.
Signed-off-by: Michal Čihař <michal@cihar.com>

.travis.yml

@@ -7,13 +7,13 @@ python:
 # - Run pylint/pep8 checker
 env:
   matrix:
-    - DJANGO_PIP="Django>=1.6,<1.7" DO_LINT=1
-    - DJANGO_PIP="Django>=1.7,<1.8" DO_LINT=1
-    - DJANGO_PIP="Django>=1.7,<1.8" TRAVIS_DATABASE=mysql
-    - DJANGO_PIP="Django>=1.7,<1.8" TRAVIS_DATABASE=postgresql
-    - DJANGO_PIP="Django>=1.7,<1.8"
-    - DJANGO_PIP="Django>=1.6,<1.7"
-    - DJANGO_PIP="Django>=1.7,<1.8" TRAVIS_DATABASE=mysql TRAVIS_RUN_TESTS="-p test_selenium.py" DO_SELENIUM=1
+    - CI_DJANGO="Django>=1.6,<1.7" CI_LINT=1
+    - CI_DJANGO="Django>=1.7,<1.8" CI_LINT=1
+    - CI_DJANGO="Django>=1.7,<1.8" CI_DATABASE=mysql
+    - CI_DJANGO="Django>=1.7,<1.8" CI_DATABASE=postgresql
+    - CI_DJANGO="Django>=1.7,<1.8"
+    - CI_DJANGO="Django>=1.6,<1.7"
+    - CI_DJANGO="Django>=1.7,<1.8" CI_DATABASE=mysql CI_RUN_TESTS="-p test_selenium.py" CI_SELENIUM=1
   global:
     - DJANGO_SETTINGS_MODULE=weblate.settings_test
 before_install:
@@ -25,8 +25,8 @@ before_install:
 # commands to install dependencies
 install:
   - timestamp.sh install
-  - pip install $DJANGO_PIP
-  - pip install -r requirements-optional.txt -r ci/requirements-travis.txt -r ci/requirements-${TRAVIS_DATABASE:-sqlite}.txt
+  - pip install $CI_DJANGO
+  - pip install -r requirements-optional.txt -r ci/requirements-travis.txt -r ci/requirements-${CI_DATABASE:-sqlite}.txt
   - pip install -r ${BUILD_TREND_HOME}/requirements.txt
 # create databases
 before_script:
@@ -37,12 +37,12 @@ before_script:
 # commands to run tests
 script:
   - timestamp.sh tests
-  - if [ -n "$DO_LINT" ] ; then ./ci/run-lint ; fi
-  - if [ -z "$DO_LINT" ] ; then ./ci/run-test ; fi
+  - if [ -n "$CI_LINT" ] ; then ./ci/run-lint ; fi
+  - if [ -z "$CI_LINT" ] ; then ./ci/run-test ; fi
 after_script:
   - timestamp.sh coveralls
-  - if [ -z "$DO_LINT" ] ; then coveralls ; fi
-  - if [ -z "$DO_LINT" ] ; then ocular --data-file ".coverage" --config-file ".coveragerc" ; fi
+  - if [ -z "$CI_LINT" ] ; then coveralls ; fi
+  - if [ -z "$CI_LINT" ] ; then ocular --data-file ".coverage" --config-file ".coveragerc" ; fi
   - timestamp.sh done
   - sync-buildtime-trend-with-gh-pages.sh
 cache:
@@ -52,4 +52,4 @@ cache:
 matrix:
   allow_failures:
     - python: "2.7"
-      env: DJANGO_PIP="Django>=1.7,<1.8" DO_LINT=1
+      env: CI_DJANGO="Django>=1.7,<1.8" CI_LINT=1

ci/run-test

@@ -4,9 +4,9 @@ set -e
 set -x
 
 ./manage.py validate
-if [ "$TRAVIS_DATABASE" = sqlite ] ; then 
+if [ "$CI_DATABASE" = sqlite ] ; then 
     ./ci/migrate-testing
 fi
 ./manage.py syncdb --noinput
 ./manage.py migrate --traceback
-coverage run --source=. ./manage.py test $TRAVIS_RUN_TESTS
+coverage run --source=. ./manage.py test $CI_RUN_TESTS

ci/setup-env

@@ -6,6 +6,6 @@ mysql -e 'DROP DATABASE IF EXISTS weblate;'
 mysql -e 'CREATE DATABASE weblate CHARACTER SET utf8 COLLATE utf8_general_ci;'
 psql -c 'DROP DATABASE IF EXISTS weblate;' -U postgres
 psql -c 'CREATE DATABASE weblate;' -U postgres
-if [ -n "$DO_SELENIUM" ] ; then 
+if [ -n "$CI_SELENIUM" ] ; then
     curl -L https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash 
 fi

shippable.yml

@@ -7,20 +7,20 @@ python:
 # - Run pylint/pep8 checker
 env:
   matrix:
-    - DJANGO_PIP="Django>=1.6,<1.7" DO_LINT=1
-    - DJANGO_PIP="Django>=1.7,<1.8" DO_LINT=1
-    - DJANGO_PIP="Django>=1.7,<1.8" TRAVIS_DATABASE=mysql
-    - DJANGO_PIP="Django>=1.7,<1.8" TRAVIS_DATABASE=postgresql
-    - DJANGO_PIP="Django>=1.7,<1.8"
-    - DJANGO_PIP="Django>=1.6,<1.7"
-    - DJANGO_PIP="Django>=1.7,<1.8" TRAVIS_DATABASE=mysql TRAVIS_RUN_TESTS="-p test_selenium.py" DO_SELENIUM=1
+    - CI_DJANGO="Django>=1.6,<1.7" CI_LINT=1
+    - CI_DJANGO="Django>=1.7,<1.8" CI_LINT=1
+    - CI_DJANGO="Django>=1.7,<1.8" CI_DATABASE=mysql
+    - CI_DJANGO="Django>=1.7,<1.8" CI_DATABASE=postgresql
+    - CI_DJANGO="Django>=1.7,<1.8"
+    - CI_DJANGO="Django>=1.6,<1.7"
+    - CI_DJANGO="Django>=1.7,<1.8" CI_DATABASE=mysql CI_RUN_TESTS="-p test_selenium.py" CI_SELENIUM=1
   global:
     - secure: d0h5h+Lne5+BM14sbhIHKef6JksyZRoHxvQMKumZ5LTlb2WNx92GksVU5aT+RbWUUzyyXi9l+Ihpy9jNRSS2i7KSIymdkfV1g3sXWCQrBGT5Q29DDcKUbj+hWeZhRWk1dKV4Yndxgh9Pre+ivMjHr5lln3rJl1lA8hD+mnQu9HnEX2dH+G2HtNdcfSPe34Lk2/DX6sRms69RBbyZm5Fl4bG44u9NSUj3n0EzYc70DS9AaBIdG7DFxrR1XhhU7rgCel366yHZiaQNb16b0d+7iC3hhKhxWSvh8rD8+qrhuqxTUF7T2KuL6zr0btK8BCXxu/xavNrbv6phNU8IM6Y27g==
     - DJANGO_SETTINGS_MODULE=weblate.settings_test_shippable
 # commands to install dependencies
 install:
-  - pip install $DJANGO_PIP
-  - pip install -r requirements-optional.txt -r ci/requirements-shippable.txt -r ci/requirements-${TRAVIS_DATABASE:-sqlite}.txt
+  - pip install $CI_DJANGO
+  - pip install -r requirements-optional.txt -r ci/requirements-shippable.txt -r ci/requirements-${CI_DATABASE:-sqlite}.txt
 # create databases
 before_script:
   - ./ci/setup-env
@@ -28,12 +28,12 @@ before_script:
   - mkdir -p shippable/codecoverage
 # commands to run tests
 script:
-  - if [ -n "$DO_LINT" ] ; then ./ci/run-lint ; fi
-  - if [ -z "$DO_LINT" ] ; then ./ci/run-test ; fi
+  - if [ -n "$CI_LINT" ] ; then ./ci/run-lint ; fi
+  - if [ -z "$CI_LINT" ] ; then ./ci/run-test ; fi
 after_script:
-  - if [ -z "$DO_LINT" ] ; then coverage xml -o shippable/codecoverage/coverage.xml ; fi
+  - if [ -z "$CI_LINT" ] ; then coverage xml -o shippable/codecoverage/coverage.xml ; fi
 cache: true
 matrix:
   allow_failures:
     - python: "2.7"
-      env: DJANGO_PIP="Django>=1.7,<1.8" DO_LINT=1
+      env: CI_DJANGO="Django>=1.7,<1.8" CI_LINT=1

weblate/trans/tests/test_selenium.py

@@ -17,7 +17,7 @@ from weblate.trans.tests.test_views import RegistrationTestMixin
 
 # Check whether we should run Selenium tests
 DO_SELENIUM = (
-    'DO_SELENIUM' in os.environ
+    ('DO_SELENIUM' in os.environ or 'CI_SELENIUM' in os.environ)
     and 'SAUCE_USERNAME' in os.environ
     and 'SAUCE_ACCESS_KEY' in os.environ
 )