From 0567f9cb57c1de11f12747b5df02e720aef8c0c1 Mon Sep 17 00:00:00 2001
From: Matt Robinson <brimstone@the.narro.ws>
Date: Thu, 13 Sep 2018 12:55:14 -0400
Subject: [PATCH] Clean up Travis and Jenkins (#353)

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

* Enable docker in travis
---
 .travis.yml | 2 ++
 Jenkinsfile | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9aa492f40..ef7f0d8c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ git:
 
 services:
   - redis
+  - docker
 
 before_install:
   - source scripts/travis-deps.sh
@@ -21,3 +22,4 @@ script:
   - make test
   - goveralls -coverprofile=.coverprofile -service=travis-ci
   - make test-captplanet
+  - make binaries
diff --git a/Jenkinsfile b/Jenkinsfile
index 944089c25..49b6c7fff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ node('node') {
     }
 
     stage('Build Images') {
-      sh 'make test-docker images'
+      sh 'make images'
 
       echo "Current build result: ${currentBuild.result}"
     }
@@ -58,7 +58,7 @@ node('node') {
   finally {
 
     stage('Cleanup') {
-      sh 'make test-docker-clean clean-images'
+      sh 'make clean-images'
       deleteDir()
     }