vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge bbf65dc1bb into c269bf7b99

Browse source
This commit is contained in:
Matthew Heon 2017-10-27 20:08:45 +00:00 • committed by GitHub
commit 8cc2b7c9a2
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -53,8 +53,9 @@ jobs:
- make docs - make docs
- make - make
go: tip go: tip
- stage: Integration Test - stage: Unit and Integration Tests
script: script:
- make testunit
- make integration - make integration
go: 1.8.x go: 1.8.x

5
Makefile
View file

@ -47,6 +47,8 @@ help:
@echo @echo
@echo " * 'install' - Install binaries to system locations" @echo " * 'install' - Install binaries to system locations"
@echo " * 'binaries' - Build crio, conmon and crioctl" @echo " * 'binaries' - Build crio, conmon and crioctl"
@echo " * 'test' - Execute unit and integration tests"
@echo " * 'testunit' - Execute unit tests"
@echo " * 'integration' - Execute integration tests" @echo " * 'integration' - Execute integration tests"
@echo " * 'clean' - Clean artifacts" @echo " * 'clean' - Clean artifacts"
@echo " * 'lint' - Execute the source code linter" @echo " * 'lint' - Execute the source code linter"
@ -115,6 +117,9 @@ crioimage:
dbuild: crioimage dbuild: crioimage
docker run --name=${CRIO_INSTANCE} --privileged ${CRIO_IMAGE} -v ${PWD}:/go/src/${PROJECT} --rm make binaries docker run --name=${CRIO_INSTANCE} --privileged ${CRIO_IMAGE} -v ${PWD}:/go/src/${PROJECT} --rm make binaries
test: crioimage
docker run -e STORAGE_OPTS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${CRIO_IMAGE} make -k testunit localintegration
integration: crioimage integration: crioimage
docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${CRIO_IMAGE} make localintegration docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${CRIO_IMAGE} make localintegration