diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-24 22:42:29 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2017-03-29 13:29:57 +0200 |
| commit | 083b5dcd6937987ac23e8316c36e793ce78eec47 (patch) | |
| tree | 25076b9eb4091fc561576e7e9450b76367fb4a92 | |
| parent | dea843aed2d3d82b805baf86843de8dce0bba6b6 (diff) | |
| download | bcfg2-083b5dcd6937987ac23e8316c36e793ce78eec47.tar.gz bcfg2-083b5dcd6937987ac23e8316c36e793ce78eec47.tar.bz2 bcfg2-083b5dcd6937987ac23e8316c36e793ce78eec47.zip | |
travis-ci: Use container-based infrastructure
The new travis infrastructure is container-based and does not allow
the use of sudo, but travis allows to install whitelisted apt packages
(http://docs.travis-ci.com/user/migrating-from-legacy/).
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rwxr-xr-x | testsuite/install.sh | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index b868e83b1..7df53364c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: python matrix: include: @@ -26,3 +27,15 @@ notifications: channels: - "irc.freenode.org#bcfg2" use_notice: true +addons: + apt: + packages: + - swig + - libxml2-utils + - yum + - libaugeas0 + - augeas-lenses + - libacl1-dev + - libssl-dev + - python-gamin + - python-selinux diff --git a/testsuite/install.sh b/testsuite/install.sh index 4d8778ad7..6f182bc0a 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -2,9 +2,6 @@ # install script for Travis-CI -sudo apt-get update -qq -sudo apt-get install swig libxml2-utils - pip install -r testsuite/requirements.txt PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))') @@ -14,9 +11,6 @@ if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then - sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev libssl-dev \ - python-gamin python-selinux - pip install PyYAML pyinotify boto pylibacl Jinja2 mercurial guppy cherrypy python-augeas if [[ ${PYVER:0:1} == "2" ]]; then |