Merge pull request #400 from lpabon/godep

Update to OpenShift Origin 1.2.0

.travis-coverage

@@ -3,12 +3,10 @@
 # We cannot use go test -coverprofile=cover.out ./... because
 # the tool requires that it be used only on one package when
 # capturing the coverage
-# This is why we need this little script here.
-export GO15VENDOREXPERIMENT=0
 COVERFILE=packagecover.out
 
 # For each package with test files, run with full coverage (including other packages)
-go list -f '{{if gt (len .TestGoFiles) 0}}"go test -covermode count -coverprofile {{.Name}}_{{len .Imports}}_{{len .Deps}}.coverprofile -coverpkg ./... {{.ImportPath}}"{{end}}' ./... | xargs -I {} bash -c {}
+go list -f '{{if gt (len .TestGoFiles) 0}}"godep go test -covermode count -coverprofile {{.Name}}_{{len .Imports}}_{{len .Deps}}.coverprofile -coverpkg ./... {{.ImportPath}}"{{end}}' ./... | xargs -I {} bash -c {}
 
 # Merge the generated cover profiles into a single file
 gocovmerge `ls *.coverprofile` > $COVERFILE

.travis.yml

@@ -7,9 +7,8 @@ before_install:
 install:
 - bash .travis-fork-fix
 - go get github.com/mattn/goveralls
-- go get github.com/robfig/glock
 - go get github.com/wadey/gocovmerge
-- glock sync github.com/heketi/heketi
+- go get github.com/tools/godep
 env:
   global:
   - secure: tCj+iGIN2GM5yPneme35KIQwqGcXMOLod00qvG/Af0lkjEVJRRNz3gnB3P2dNyj9Nc4FWxSUIjCiIkblOMaEKxPXp1S3Zo7gRBVphyNY5ZvIKeqKoXvBPd6hi9Ft2TaN+4vDczfAKOI/S3/3kN3NmgGCYNTLOues0T4yhVd3v14hoQJxw4Jbjlsj8RGfLrqp+dInFv2tS+xTyK+q/EOiaCpBq4PfK6giKwt943o7jc9v0iWjnP2rWq/AotMo4QutoC0OVeJT8aG41sC5LvlYTBQB22E8Zv439JgHsdhQU1NRd/1VLGKATToxkUxh2Reei42koAWFJ+EfFvAIx03k5+ZYJY7W+Rtuy8jn0uRaZyvvQdUvyT22e9lSJzqkP6JAe7oru9hf9X4K0XSOfMMFUiJDC+rNm0Ajd+r/5h6C+jRqIMDvvFgdlCkM8gKIX1B5N+RM1hxurAGTRpdCPuDVLVeTCbNZCds8jiK1DNky6Ni66plBIV+LKQY3EpjBn0jaWfPdTJbU5OiOb1uadnmzj2yt65Mp3T8QJD3dotURISR8bIS+Xb6vAytKFWmtcqje5Hx4lFTfyrH3gRGjMyeS9j3pVjbbCCV466FHOp9oglpoFv49nXhivPzLqU7mSuLIue+5RZ318HykuBWI+6xAo8aH9nnoBmAWiGCxXwIr13Y=
@@ -24,7 +23,7 @@ matrix:
 script:
 - go fmt ./... | wc -l | grep 0
 - go vet ./...
-- if [[ -z "$COVERAGE" ]]; then GO15VENDOREXPERIMENT=0 go test $OPTIONS ./...; fi
+- if [[ -z "$COVERAGE" ]]; then godep go test $OPTIONS ./...; fi
 - if [[ -n "$COVERAGE" ]]; then bash .travis-coverage; fi
 - cd client/api/python 
 - ./unittests.sh