run integration tests as part of the build

Author: imikushin

.dockerignore

@@ -8,7 +8,8 @@ tmp
 state
 build
 dist
-assets
 Godeps/_workspace/pkg
 tests/integration/.venv*
 tests/integration/.tox
+*/*/*/*.pyc
+*/*/*/__pycache__

.dockerignore.docker

@@ -7,5 +7,8 @@ gopath
 tmp
 state
 build
-assets
 Godeps/_workspace/pkg
+tests/integration/.venv*
+tests/integration/.tox
+*/*/*/*.pyc
+*/*/*/__pycache__

.gitignore

@@ -10,3 +10,5 @@
 /tests/integration/MANIFEST
 /tests/integration/.venv*
 /tests/integration/.tox
+*.pyc
+__pychache__

Dockerfile.build-base

@@ -2,7 +2,8 @@ FROM debian:jessie
 RUN apt-get update && \
     apt-get -y dist-upgrade && \
     apt-get -y install locales sudo vim less curl wget git rsync build-essential syslinux isolinux xorriso \
-        libblkid-dev libmount-dev libselinux1-dev
+        libblkid-dev libmount-dev libselinux1-dev genisoimage qemu-kvm python-pip
+RUN ln -s /usr/bin/genisoimage /usr/bin/mkisofs
 RUN locale-gen en_US.UTF-8
 RUN curl -sSL https://get.docker.com/ | sh
 
@@ -11,6 +12,8 @@ RUN curl -sSL https://get.docker.com/ | sh
 #ENV LC_ALL en_US.UTF-8
 #ENV TERM linux
 
+RUN pip install tox
+
 ENV GOLANG_VERSION 1.4.2
 RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz | tar -v -C /usr/src -xz
 RUN cd /usr/src/go/src && ./make.bash --no-clean 2>&1

Makefile.docker

@@ -60,5 +60,7 @@ build-all: \
 	$(DIST)/artifacts/rancheros.iso \
 	$(DIST)/artifacts/iso-checksums.txt
 
+integration-tests:
+	cd tests/integration && tox
 
-.PHONY: build-all installer version bin/rancheros
+.PHONY: build-all installer version bin/rancheros integration-tests

assets/empty-hd.img.gz

@@ -9,4 +9,4 @@ fi
 
 docker build -t ros-build-base -f Dockerfile.build-base .
 docker build -t ros-build -f Dockerfile.build .
-./scripts/docker-run.sh make -f Makefile.docker build-all
+./scripts/docker-run.sh make -f Makefile.docker build-all integration-tests

scripts/ci

@@ -10,4 +10,4 @@ if [ -n "$BIND_DIR" ]; then
 fi
 
 docker rm -fv ros-build >/dev/null 2>&1 || true
-exec docker run -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS --name=ros-build ros-build "$@"
+exec docker run --privileged -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS --name=ros-build ros-build "$@"

scripts/docker-run.sh

@@ -4,7 +4,7 @@ skipsdist=True
 
 [testenv]
 deps=-rrequirements.txt
-commands=py.test --durations=20 rancherostest {posargs}
+commands=py.test -s --durations=20 rancherostest {posargs}
 
 [testenv:flake8]
 deps=flake8