Use the 'master' branch of beat.core again

.gitlab-ci.yml

-py27-linux:
+stages:
+  - build
+
+variables:
+  PREFIX: /opt/beat.env.web/usr
+
+build:
+  stage: build
+  except:
+    - /^v\d+\.\d+\.\d+([abc]\d*)?$/  # PEP-440 compliant version (tags)
+  before_script:
+  - ${PREFIX}/bin/python --version
+  - docker info
   script:
   - git clean -ffdx
-  - export TMPDIR=/var/tmp
-  - /idiap/project/beat/environments/staging/usr/bin/python bootstrap-buildout.py --setuptools-version=`/idiap/project/beat/environments/staging/usr/bin/python -c 'import setuptools; print(setuptools.__version__)'`
+  - ${PREFIX}/bin/python bootstrap-buildout.py
   - ./bin/buildout
-  - ./bin/python --version
-  - unset TMPDIR
-  - cd src/cpulimit && make && cd -
-  - cd bin && ln -s ../src/cpulimit/src/cpulimit . && cd -
   - export COVERAGE_FILE=.coverage.django
   - export BEAT_TEST_PREFIX=`mktemp -d --tmpdir=/var/tmp beat_test_prefix.XXXXXXXXX`
-  - ./bin/coverage run --source='./beat/web' ./bin/django test --settings=beat.web.settings.test -v 2
+  - ./bin/python ${PREFIX}/bin/coverage run --source=${CI_PROJECT_NAME} ${PREFIX}/bin/django test --settings=beat.web.settings.test -v 2
   - export BEAT_CMDLINE_TEST_PLATFORM=django://beat.web.settings.test
   - export COVERAGE_FILE=.coverage.cmdline
   - export NOSE_WITH_COVERAGE=1
   - export NOSE_COVER_PACKAGE=beat.web
-  - ./bin/nosetests -sv beat.cmdline
+  - ./bin/python ${PREFIX}/bin/coverage run --source=./src/beat.cmdline ${PREFIX}/bin/nosetests -sv beat.cmdline
   - unset COVERAGE_FILE
   - rm -rf $BEAT_TEST_PREFIX
   - unset BEAT_TEST_PREFIX
-  - ./bin/coverage combine .coverage.django .coverage.cmdline
-  - ./bin/coverage report
-  - ./bin/sphinx-apidoc --separate -d 2 --output=doc/api/api beat beat/web/*/migrations beat/web/*/tests
-  - ./bin/sphinx-build doc/api html/api
-  - ./bin/sphinx-build doc/admin html/admin
-  - ./bin/sphinx-build doc/user html/user
-
-  tags:
-  - lidiap2015
-
-py27-macosx:
-  script:
-  - git clean -ffdx
-  - /Users/buildbot/work/environments/beat/py27/bin/python bootstrap-buildout.py --setuptools-version=`/Users/buildbot/work/environments/beat/py27/bin/python -c 'import setuptools; print(setuptools.__version__)'`
-  - ./bin/buildout
-  - ./bin/python --version
-  - cd src/cpulimit && make && cd -
-  - cd bin && ln -s ../src/cpulimit/src/cpulimit . && cd -
-  - export COVERAGE_FILE=.coverage.django
-  - rm -rf ./test_prefix
-  - ./bin/coverage run --source='./beat/web' ./bin/django test --settings=beat.web.settings.test -v 2
-  - export BEAT_CMDLINE_TEST_PLATFORM=django://beat.web.settings.test
-  - export COVERAGE_FILE=.coverage.cmdline
-  - export NOSE_WITH_COVERAGE=1
-  - export NOSE_COVER_PACKAGE=beat.web
-  - ./bin/nosetests -sv beat.cmdline
-  - unset COVERAGE_FILE
-  - ./bin/coverage combine .coverage.django .coverage.cmdline
-  - ./bin/coverage report
-  - ./bin/sphinx-apidoc --separate -d 2 --output=doc/api/api beat beat/web/*/migrations beat/web/*/tests
-  - ./bin/sphinx-build doc/api html/api
-  - ./bin/sphinx-build doc/admin html/admin
-  - ./bin/sphinx-build doc/user html/user
+  - ./bin/python ${PREFIX}/bin/coverage combine .coverage.django .coverage.cmdline
+  - ./bin/python ${PREFIX}/bin/coverage report
+  - ./bin/python ${PREFIX}/bin/sphinx-apidoc --separate -d 2 --output=doc/api ${CI_PROJECT_NAMESPACE} beat/web/*/migrations beat/web/*/tests
+  - ./bin/python ${PREFIX}/bin/sphinx-build doc/api html/api
+  - ./bin/python ${PREFIX}/bin/sphinx-build doc/admin html/admin
+  - ./bin/python ${PREFIX}/bin/sphinx-build doc/user html/user
   tags:
-  - beat-macosx
+  - docker-build

buildout.cfg

@@ -85,11 +85,10 @@ eggs = alabaster
        wsgiref
 
 [sources]
-beat.core = git git@gitlab.idiap.ch:beat/beat.core branch=docker
+beat.core = git git@gitlab.idiap.ch:beat/beat.core
 beat.cmdline = git git@gitlab.idiap.ch:beat/beat.cmdline
 beat.backend.python = git git@gitlab.idiap.ch:beat/beat.backend.python
 beat.examples = git git@gitlab.idiap.ch:beat/beat.examples egg=false
-cpulimit = git https://github.com/opsengine/cpulimit rev=v0.2 egg=false
 
 [scripts]
 recipe = bob.buildout:scripts