From 86945c70db403c2debc18034f4edcf98df245330 Mon Sep 17 00:00:00 2001
From: John Mulligan <jmulligan@redhat.com>
Date: Wed, 11 Mar 2020 13:51:05 -0400
Subject: [PATCH] travis: use makefile rules in travis configuration

Instead of duplicating some of the actions in the travis yaml file and
the Makefile, have travis rules make use of the Makefile.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d6597b..1df9472 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,13 @@ matrix:
     - env: CEPH_VERSION=nautilus
 
 before_install: |
-  docker build --build-arg CEPH_VERSION="${CEPH_VERSION}" -t ceph-golang-ci .
+  make ci-image CEPH_VERSION=${CEPH_VERSION}
 
 before_script:
   - go get github.com/mgechev/revive
 
 # cephfs (fuse) requires: --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
 script:
-  - docker run --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined --rm -it -v ${PWD}:/go/src/github.com/ceph/go-ceph:z ceph-golang-ci
+  - make test-container CEPH_VERSION=${CEPH_VERSION}
 # run style checks
   - make check