Merge pull request #14 from secynic/dev

secynic · Oct 15, 2016 · 5a019df · 5a019df
2 parents 1e393d4 + bbef284
commit 5a019df
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,9 @@ services:
   - docker
 before_install:
   - chmod ugo+x nfsinkhole/tests/travis_tests.sh
-  - sudo apt-get -qq update
-  - sudo apt-get install -y selinux-basics selinux-policy-default auditd
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.6* ]]; then pip install -r requirements/python2.6.txt; fi
   - pip install coveralls
   - python setup.py install
 script: ./nfsinkhole/tests/travis_tests.sh
-after_success:
+after_script:
   - coveralls --rcfile=.coveragerc
diff --git a/README.rst b/README.rst
@@ -4,7 +4,7 @@ nfsinkhole
 
 .. image:: https://travis-ci.org/secynic/nfsinkhole.svg?branch=master
     :target: https://travis-ci.org/secynic/nfsinkhole
-.. image:: https://coveralls.io/repos/github/secynic/nfsinkhole/badge.svg?branch=master
+.. image:: https://coveralls.io/repos/github/secynic/nfsinkhole/badge.svg?branch=master&dummy=none
     :target: https://coveralls.io/github/secynic/nfsinkhole?branch=master
 .. image:: https://img.shields.io/badge/license-BSD%202--Clause-blue.svg
     :target: https://github.com/secynic/nfsinkhole/tree/master/LICENSE.txt

diff --git a/nfsinkhole/tests/travis_tests.sh b/nfsinkhole/tests/travis_tests.sh
@@ -2,33 +2,39 @@
 export PS4='\033[32m+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }\033[0m'
 set -eo xtrace
 
-nosetests -v -w nfsinkhole --include=docker --with-coverage --cover-package=nfsinkhole
-
 if [ "${TRAVIS_PYTHON_VERSION}" = "2.7" ]; then
-    sudo docker pull centos:7
-    sudo docker network create --driver=bridge sinknet --subnet=172.19.0.0/24
-    sudo docker run -d -e "container=docker" -v /sys/fs/cgroup:/sys/fs/cgroup --privileged --name nfsinkholevm -t centos:7 /usr/sbin/init
-    sudo docker network connect sinknet nfsinkholevm
-    sudo docker ps -a | grep nfsinkholevm
-    sudo docker network ls
-    sudo docker cp ${TRAVIS_BUILD_DIR} nfsinkholevm:/root/nfsinkhole
-    sudo docker exec nfsinkholevm /bin/sh -c "yum -y -q install net-tools"
-    sudo docker exec nfsinkholevm /bin/sh -c "yum -y -q install iptables"
-    sudo docker exec nfsinkholevm /bin/sh -c "yum -y -q install tcpdump"
-    sudo docker exec nfsinkholevm /bin/sh -c "yum -y -q install rsyslog"
-    sudo docker exec nfsinkholevm /bin/sh -c "ifconfig"
-    sudo docker exec nfsinkholevm /bin/sh -c "ls -al /root/nfsinkhole"
-    sudo docker exec nfsinkholevm /bin/sh -c "cd /root/nfsinkhole/ && python setup.py install"
-    sudo docker exec --privileged nfsinkholevm /bin/sh -c "python /usr/bin/nfsinkhole-setup.py --interface eth1 --install --pcap --loglevel debug"
-    sudo docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-setup.log && rm /var/log/nfsinkhole-setup.log"
-    sudo docker exec --privileged nfsinkholevm /bin/sh -c "systemctl start nfsinkhole.service"
-    sudo docker exec --privileged nfsinkholevm /bin/sh -c "systemctl status nfsinkhole.service"
-    sudo docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-service.log && rm /var/log/nfsinkhole-service.log"
-    sudo docker exec nfsinkholevm /bin/sh -c "ps aux | grep /usr/sbin/tcpdump"
-    sudo docker exec --privileged nfsinkholevm /bin/sh -c "systemctl stop nfsinkhole.service"
-    sudo docker exec --privileged nfsinkholevm /bin/sh -c "systemctl status nfsinkhole.service || true"
-    sudo docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-service.log && rm /var/log/nfsinkhole-service.log"
-    sudo docker exec nfsinkholevm /bin/sh -c "ps aux | grep /usr/sbin/tcpdump"
-    sudo docker exec --privileged nfsinkholevm /bin/sh -c "python /usr/bin/nfsinkhole-setup.py --interface eth1 --uninstall --loglevel debug"
-    sudo docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-setup.log && rm /var/log/nfsinkhole-setup.log"
+    docker pull centos:7
+    docker network create --driver=bridge sinknet --subnet=172.19.0.0/24
+    docker run -d -e "container=docker" -v /sys/fs/cgroup:/sys/fs/cgroup --privileged --name nfsinkholevm -t centos:7 /usr/sbin/init
+    docker network connect sinknet nfsinkholevm
+    docker ps -a | grep nfsinkholevm
+    docker network ls
+    docker exec nfsinkholevm /bin/sh -c "mkdir /home/travis && mkdir /home/travis/build && mkdir /home/travis/build/secynic"
+    docker cp ${TRAVIS_BUILD_DIR} nfsinkholevm:/home/travis/build/secynic/nfsinkhole
+    docker exec nfsinkholevm /bin/sh -c "yum -y -q install net-tools"
+    docker exec nfsinkholevm /bin/sh -c "yum -y -q install iptables"
+    docker exec nfsinkholevm /bin/sh -c "yum -y -q install tcpdump"
+    docker exec nfsinkholevm /bin/sh -c "yum -y -q install rsyslog"
+    docker exec nfsinkholevm /bin/sh -c "yum -y -q install epel-release && yum clean all"
+    docker exec nfsinkholevm /bin/sh -c "yum -y -q install python-pip && yum clean all"
+    docker exec nfsinkholevm /bin/sh -c "pip install coverage"
+    docker exec nfsinkholevm /bin/sh -c "pip install nose"
+    docker exec nfsinkholevm /bin/sh -c "ifconfig"
+    docker exec nfsinkholevm /bin/sh -c "ls -al /home/travis/build/secynic/nfsinkhole"
+    docker exec nfsinkholevm /bin/sh -c "cd /home/travis/build/secynic/nfsinkhole/ && python setup.py install"
+    docker exec nfsinkholevm /bin/sh -c "cd /home/travis/build/secynic/nfsinkhole/ && nosetests -v -w /home/travis/build/secynic/nfsinkhole/nfsinkhole --include=docker --with-coverage --cover-package=nfsinkhole"
+    docker exec --privileged nfsinkholevm /bin/sh -c "python /usr/bin/nfsinkhole-setup.py --interface eth1 --install --pcap --loglevel debug"
+    docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-setup.log && rm /var/log/nfsinkhole-setup.log"
+    docker exec --privileged nfsinkholevm /bin/sh -c "systemctl start nfsinkhole.service"
+    docker exec --privileged nfsinkholevm /bin/sh -c "systemctl status nfsinkhole.service"
+    docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-service.log && rm /var/log/nfsinkhole-service.log"
+    docker exec nfsinkholevm /bin/sh -c "ps aux | grep /usr/sbin/tcpdump"
+    docker exec --privileged nfsinkholevm /bin/sh -c "systemctl stop nfsinkhole.service"
+    docker exec --privileged nfsinkholevm /bin/sh -c "systemctl status nfsinkhole.service || true"
+    docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-service.log && rm /var/log/nfsinkhole-service.log"
+    docker exec nfsinkholevm /bin/sh -c "ps aux | grep /usr/sbin/tcpdump"
+    docker exec --privileged nfsinkholevm /bin/sh -c "python /usr/bin/nfsinkhole-setup.py --interface eth1 --uninstall --loglevel debug"
+    docker exec nfsinkholevm /bin/sh -c "cat /var/log/nfsinkhole-setup.log && rm /var/log/nfsinkhole-setup.log"
+    docker cp nfsinkholevm:/home/travis/build/secynic/nfsinkhole/.coverage /home/travis/build/secynic/nfsinkhole
+    coveralls --rcfile=.coveragerc
 fi