JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up Travis and Jenkins (#353)

Browse Source 
* Make travis do what Jenkins will do. Make Jenkins not do what Travis does.

* Enable docker in travis
This commit is contained in:
Matt Robinson 2018-09-13 12:55:14 -04:00 committed by Philip Hutchins
parent 3399376eb2
commit 0567f9cb57
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,6 +8,7 @@ git:
services: services:
- redis - redis
- docker
before_install: before_install:
- source scripts/travis-deps.sh - source scripts/travis-deps.sh
@ -21,3 +22,4 @@ script:
- make test - make test
- goveralls -coverprofile=.coverprofile -service=travis-ci - goveralls -coverprofile=.coverprofile -service=travis-ci
- make test-captplanet - make test-captplanet
- make binaries

4
Jenkinsfile vendored
View File

@ -9,7 +9,7 @@ node('node') {
} }
stage('Build Images') { stage('Build Images') {
sh 'make test-docker images' sh 'make images'
echo "Current build result: ${currentBuild.result}" echo "Current build result: ${currentBuild.result}"
} }
@ -58,7 +58,7 @@ node('node') {
finally { finally {
stage('Cleanup') { stage('Cleanup') {
sh 'make test-docker-clean clean-images' sh 'make clean-images'
deleteDir() deleteDir()
} }