From 6fe661849a4f1bd0ae9ed67879528e9ea758d89b Mon Sep 17 00:00:00 2001
From: Lei Xue <xuelei@momenta.ai>
Date: Sun, 18 Nov 2018 17:26:27 +0800
Subject: [PATCH] update ci test for travis

---
 .travis.yml          | 6 +-----
 ci/ceph_install.sh   | 6 +-----
 hack/verify-gofmt.sh | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a4d6541..5de8acb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,22 +25,18 @@ before_script:
     - bash ci/ceph_micro-osd.sh /tmp/micro-ceph
     - export CEPH_CONF=/tmp/micro-ceph/ceph.conf
     - ceph status
-    - go get github.com/kr/godep
     - sudo apt-get install -y libcunit1 libcunit1-doc libcunit1-dev
     - sudo apt-get install -y open-iscsi
 
 script:
    - cd ${TRAVIS_BUILD_DIR}
-   - ./autogen.sh
-   - ./configure
    - make
    - hack/verify-gofmt.sh
-   - export GOPATH=`pwd`/Godeps/_workspace/:$GOPATH
    - go test -v ./pkg/...
    - dd if=/dev/zero of=/var/tmp/disk.img bs=1024 count=102400
    - mkdir ${HOME}/.gotgt
    - echo ${TGT_CFG} > ${HOME}/.gotgt/config.json
-   - ./gotgt daemon --log debug 1>/dev/null 2>&1 &
+   - ./_output/cmd/bin/gotgt daemon --log debug 1>/dev/null 2>&1 &
    # libiscsi test
    - mkdir ${HOME}/libiscsi
    - git clone https://github.com/gostor/libiscsi ${HOME}/libiscsi
diff --git a/ci/ceph_install.sh b/ci/ceph_install.sh
index 83068c3..278a0ab 100755
--- a/ci/ceph_install.sh
+++ b/ci/ceph_install.sh
@@ -12,11 +12,7 @@ CEPH_RELEASE=jewel
 mkdir $WORKDIR
 pushd $WORKDIR
 
-ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -N ''
-cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-chmod 600 ~/.ssh/authorized_keys
-
-git clone git://github.com/ceph/ceph-deploy
+git clone -b "v2.0.0" --single-branch --depth 1 https://github.com/ceph/ceph-deploy
 pushd ceph-deploy
 ./bootstrap
 ./ceph-deploy install --release ${CEPH_RELEASE} `hostname`
diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh
index 7bf16bb..5577d1b 100755
--- a/hack/verify-gofmt.sh
+++ b/hack/verify-gofmt.sh
@@ -7,7 +7,7 @@ set -o pipefail
 find_files() {
   find . -not \( \
       \( \
-        -wholename '*/Godeps/*' \
+        -wholename '*/vendor/*' \
       \) -prune \
     \) -name '*.go'
 }