Merge pull request #2825 from tardyp/py366

refacto of the bbtravis.yml and travis.yml
buildbot · Feb 26, 2017 · fe22ca0 · fe22ca0
2 parents 963b657 + 17991dd
commit fe22ca0
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 120 deletions.
diff --git a/.bbtravis.yml b/.bbtravis.yml
@@ -3,16 +3,15 @@
 language: python
 
 # Available Python versions:
-# http://about.travis-ci.org/docs/user/ci-environment/#Python-VM-images
 python:
   - "2.7"
 
 env:
   global:
   - BUILDBOT_TEST_DB_URL=sqlite://
   matrix:
-  # lint, docs and coverage first as they're more likely to find issues
-  - TWISTED=latest SQLALCHEMY=latest TESTS=lint
+  # pylint, docs and coverage first as they're more likely to find issues
+  - TWISTED=latest SQLALCHEMY=latest TESTS=pylint
   - TWISTED=latest SQLALCHEMY=latest TESTS=flake8
   - TWISTED=latest SQLALCHEMY=latest TESTS=isort
   - TWISTED=latest SQLALCHEMY=latest TESTS=docs
@@ -25,14 +24,20 @@ env:
   - TWISTED=14.0.2 SQLALCHEMY=latest TESTS=trial
   - TWISTED=15.4.0 SQLALCHEMY=latest TESTS=trial
   - TWISTED=latest SQLALCHEMY=latest TESTS=trial
+
   # Configuration when SQLite database is persistent between running tests
   # (by default in other tests in-memory SQLite database is used which is
   # recreated for each test).
   # Helps to detect issues with incorrect database setup/cleanup in tests.
   - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=sqlite:////tmp/test_db.sqlite
   # Configuration that runs tests with real MySQL database (TODO does not work yet with our docker image)
   - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest
-  - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest?storage_engine=InnoDB
+
+  # innodb tests takes 20min probably because of docker aufs.
+  # travis images provides much faster innodb so we keep these test there until we implement ramfs based
+  # mysql installation
+  # - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest?storage_engine=InnoDB
+
   # Configuration that runs tests with real PostgreSQL database with pg8000 and psycopg2 drivers
   # psycopg2 uses Peer Authentication which is configured in the dockerfile, while pg8000 use md5 auth with dummy password
   #- TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=postgresql+psycopg2:///bbtest
@@ -42,38 +47,21 @@ env:
   - TWISTED=15.5.0 SQLALCHEMY=0.8.0 TESTS=trial
   - TWISTED=15.5.0 SQLALCHEMY=latest TESTS=trial
 
-  # Configuration to run `python setup.py test` to check this test runner.
-  # - TWISTED=latest SQLALCHEMY=latest TESTS=setuppy_test
-
   # Tests for the worker on old versions of twisted.
   - TWISTED=10.2.0 SQLALCHEMY=latest TESTS=trial_worker
   - TWISTED=11.1.0 SQLALCHEMY=latest TESTS=trial_worker
   - TWISTED=12.2.0 SQLALCHEMY=latest TESTS=trial_worker
   - TWISTED=13.2.0 SQLALCHEMY=latest TESTS=trial_worker
 
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - www/base/node_modules
-    - www/codeparameter/node_modules
-    - www/console_view/node_modules
-    - www/waterfall_view/node_modules
-    - www/nestedexample/node_modules
-    - www/base/libs
-    - www/codeparameter/libs
-    - www/console_view/libs
-    - www/waterfall_view/libs
-    - www/nestedexample/libs
-
 matrix:
   fast_finish: true
   include:
     # Tests of buildbot-worker on python 2.6
-    # Specify SQLALCHEMY=latest to avoid errors installing.
-    #- python: "2.6"
-    #  env: TWISTED=14.0.2 TESTS=trial_worker SQLALCHEMY=latest
-    #- python: "2.6"
-    #  env: TWISTED=15.4.0 TESTS=trial_worker SQLALCHEMY=latest
+    - python: "2.6"
+      env: TWISTED=14.0.2 TESTS=trial_worker SQLALCHEMY=latest
+    - python: "2.6"
+      env: TWISTED=15.4.0 TESTS=trial_worker SQLALCHEMY=latest
+
     # python 3 tests
     - python: "3.5"
       env: TWISTED=trunk SQLALCHEMY=latest TESTS=coverage
@@ -82,6 +70,9 @@ matrix:
     - python: "3.5"
       env: TWISTED=latest SQLALCHEMY=latest TESTS=smokes
 
+    - python: "3.6"
+      env: TWISTED=trunk SQLALCHEMY=latest TESTS=py3next
+
 # Dependencies installation commands
 install:
   - pip install -U pip
@@ -107,13 +98,10 @@ install:
       # install buildbot_www from pip in order to run the www tests
       pip install buildbot_www
 
-      if [ $TESTS = lint -o $TESTS = flake8 -o $TESTS = isort ]; then pip install -e './master[docs,test]'; fi
+      if [ $TESTS = pylint -o $TESTS = flake8 -o $TESTS = isort ]; then pip install -e './master[docs,test]'; fi
       # until towncrier toml is released, we need to fetch from git :-/
       if [ $TESTS = docs ]; then pip install -e './master[docs]' 'git+https://github.com/tardyp/towncrier'; fi
 
-      if [ $TESTS = setuppy_test ]; then ! (pip list | grep Twisted); fi
-      if [ $TESTS = setuppy_test ]; then pip install autobahn Twisted; fi
-
 before_script:
   # create real database for tests
   - condition: '"mysql" in BUILDBOT_TEST_DB_URL'
@@ -149,9 +137,14 @@ script:
     condition: TESTS == "coverage"
     cmd: coverage run --rcfile=.coveragerc $(which trial) --reporter=text --rterrors buildbot.test buildbot_worker.test
 
+  # blacklisting testrunner for new version of py3
+  - title: py3 tests
+    condition: TESTS == "py3next"
+    cmd: python common/run_py3_working_tests.py
+
   # Run additional tests in their separate job
   - title: pylint
-    condition: TESTS == "lint"
+    condition: TESTS == "pylint"
     cmd: make pylint
 
   - title: flake8

diff --git a/.py3.notworking.txt b/.py3.notworking.txt
@@ -0,0 +1,2 @@
+buildbot.test.unit.test_www_rest.V2RootResource.test_default_origin
+
diff --git a/.travis.yml b/.travis.yml
@@ -21,52 +21,13 @@ python:
   - "2.7"
 
 env:
-  # Configuration when SQLite database is persistent between running tests
-  # (by default in other tests in-memory SQLite database is used which is
-  # recreated for each test).
-  # Helps to detect issues with incorrect database setup/cleanup in tests.
-  # Configuration that runs tests with real MySQL database
-  - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest
-  - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest?storage_engine=InnoDB
-  # Configuration that runs tests with real PostgreSQL database with pg8000 and psycopg2 drivers
-  - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=postgresql+psycopg2:///bbtest?user=postgres
-  - TWISTED=latest SQLALCHEMY=latest TESTS=trial BUILDBOT_TEST_DB_URL=postgresql+pg8000:///bbtest?user=postgres
-
-  # Test different versions of SQLAlchemy
-  - TWISTED=15.5.0 SQLALCHEMY=0.8.0 TESTS=trial
-  - TWISTED=15.5.0 SQLALCHEMY=latest TESTS=trial
-
-  # Configuration to run `python setup.py test` to check this test runner.
-  # - TWISTED=latest SQLALCHEMY=latest TESTS=setuppy_test
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - www/base/node_modules
-    - www/codeparameter/node_modules
-    - www/console_view/node_modules
-    - www/waterfall_view/node_modules
-    - www/nestedexample/node_modules
-    - www/base/libs
-    - www/codeparameter/libs
-    - www/console_view/libs
-    - www/waterfall_view/libs
-    - www/nestedexample/libs
-
-matrix:
-  fast_finish: true
-  include:
-    # Specify SQLALCHEMY=latest to avoid errors installing.
-    - python: "3.5"
-      env: TWISTED=trunk TESTS=flake8 SQLALCHEMY=latest
-
-    # Tests of buildbot-worker on python 2.6
-    - python: "2.6"
-      env: TWISTED=14.0.2 TESTS=trial_worker SQLALCHEMY=latest
-    # python 3 tests
-    - python: "3.5"
-      env: TWISTED=trunk TESTS=trial SQLALCHEMY=latest
+  # we now use travis only for real database testing
+  # travis containers do have much more optimized db installations
 
+  - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=mysql+mysqldb://travis@127.0.0.1/bbtest?storage_engine=InnoDB
+  # Configuration that runs tests with real PostgreSQL database with pg8000 and psycopg2 drivers
+  - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=postgresql+psycopg2:///bbtest?user=postgres
+  - TWISTED=latest SQLALCHEMY=latest TESTS=coverage BUILDBOT_TEST_DB_URL=postgresql+pg8000:///bbtest?user=postgres
 
 # Dependencies installation commands
 install:
@@ -80,38 +41,13 @@ install:
   # Install mysqlclient for tests that uses real MySQL
   # Install psycopg2 and pg8000 for tests that uses real PostgreSQL
   - |
-      if [ $TESTS = trial -o $TESTS = coverage -o $TESTS = js ]; then
       pip install -e pkg \
                   -e 'master[tls,test]' \
                   -e 'worker[test]' \
                   mysqlclient \
                   psycopg2 \
-                  pg8000
-      fi
-
-  - |
-      if [ $TESTS = trial_worker ]; then
-      pip install -e 'worker[test]'
-      fi
-
-  # install buildbot_www from pip in order to run the www tests
-  - "if [ $TESTS = trial -o $TESTS = coverage ]; then pip install --pre buildbot_www ; fi"
-
-
-  - "pip install -e worker future"
-
-  # Install sphinx so that pylint will be able to import it
-  - "if [ $TESTS = lint ]; then  pip install sphinx ; fi"
-  # Install docs dependencies for running the tests
-  # until towncrier toml is released, we need to fetch from git :-/
-  - "if [ $TESTS = docs ]; then  pip install -e './master[docs]' 'git+https://github.com/tardyp/towncrier' ; fi"
-
-  # Check that Twisted is not installed during previous steps on setuppy_test configuration.
-  # In setuppy_test all dependencies should be installed by setuptools during tests.
-  - "if [ $TESTS = setuppy_test ]; then ! (pip list | grep Twisted) ; fi"
-  # Automatic installation of autobahn during `setup.py test` fails due to:
-  # https://github.com/pypa/setuptools/issues/500
-  - "if [ $TESTS = setuppy_test ]; then pip install autobahn Twisted ; fi"
+                  pg8000 \
+                  buildbot_www
 
 before_script:
   # create real MySQL database for tests
@@ -121,24 +57,10 @@ before_script:
 
 # Tests running commands
 script:
-  # make frontend_install_tests takes 17 min, so we only do it post submit
-  - "if [ $TESTS = js -a ${TRAVIS_PULL_REQUEST} = false ]; then make frontend ; fi"
-  - "if [ $TESTS = js -a ${TRAVIS_PULL_REQUEST} = false ]; then make frontend_install_tests ; fi"
-  - "if [ $TESTS = trial ]; then trial  --reporter=text --rterrors buildbot.test buildbot_worker.test; fi"
-  - "if [ $TESTS = trial_worker ]; then trial  --reporter=text --rterrors buildbot_worker.test; fi"
-  # run tests under coverage for latest only (it's slower..)
+  # run real db tests under coverage to have several merging coverage report
+  # https://github.com/codecov/support/wiki/Merging-Reports
   - "if [ $TESTS = coverage ]; then coverage run --rcfile=.coveragerc $(which trial) --reporter=text --rterrors buildbot.test buildbot_worker.test ; fi"
 
-  # Build documentation
-  - "if [ $TESTS = docs ]; then make docs ; fi"
-  # Run spell checker on documentation
-  - "if [ $TESTS = docs ]; then make -C master/docs SPHINXOPTS=-W spelling ; fi"
-  # Runs Sphinx' external link checker only on post submit build (it is too unstable)
-  - "if [ $TESTS = docs -a ${TRAVIS_PULL_REQUEST} = false ]; then make -C master/docs SPHINXOPTS=-q linkcheck; fi"
-
-  - "if [ $TESTS = setuppy_test ]; then (cd master; python setup.py test) ; fi"
-  - "if [ $TESTS = setuppy_test ]; then (cd worker; python setup.py test) ; fi"
-
 
 notifications:
   email: false
@@ -156,6 +78,5 @@ branches:
   only:
     - master
     - eight
-    - buildbot-0.9.0
 git:
   depth: 300