htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean pull request

Browse Source
This commit is contained in:
yqbk
2016-10-24 23:02:44 +02:00
parent 595a2a009b
commit c937a1a9ef
9 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.travis.yml
View File

@ -2,7 +2,6 @@ sudo: required
services:
- docker
# https://docs.travis-ci.com/user/docker/
addons:
code_climate:
@ -11,21 +10,14 @@ addons:
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- echo 'DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --iptables=false"' | sudo tee /etc/default/docker > /dev/null
#- export DOCKER_HOST=tcp://192.168.23.75:2375
- sudo service docker restart
- sleep 5
#- docker pull openhpi/docker_java
- docker pull openhpi/docker_ruby
# - docker pull openhpi/docker_python
#before_install:
# - sudo apt-get update
#- sudo apt-get upgrade lxc-docker
#- echo 'DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --iptables=false"' | sudo tee /etc/default/docker > /dev/null
#- sudo service docker restart
#- sleep 5
#- sudo docker pull weldpua2008/docker-ansible:${OS_TYPE}${OS_VERSION}_v${ANSIBLE_VERSION}
# Config to run docker tests - doesn't work so far
# - sudo apt-get update
# - sudo apt-get upgrade lxc-docker
# - echo 'DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --iptables=false"' | sudo tee /etc/default/docker > /dev/null
# - export DOCKER_HOST=tcp://192.168.23.75:2375
# - sudo service docker restart
# - sleep 5
# - docker pull openhpi/docker_ruby
before_script:
- cp .rspec.travis .rspec
@ -40,10 +32,11 @@ cache: bundler
language: ruby
rvm:
- 2.3.1
# - 2.1.5
# - 2.2.1
# - 2.1.5
# - 2.2.1
script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper --tag ~docker
# one of the solutions I've found
# - sudo docker run --rm=true -v `pwd`:/ansible-apache:rw weldpua2008/docker-ansible:${OS_TYPE}${OS_VERSION}_v${ANSIBLE_VERSION} /bin/bash -c "/ansible-apache/tests/test-in-docker-image.sh ${OS_TYPE} ${OS_VERSION} ${ANSIBLE_VERSION}"