Merge branch 'master' into jjm-hdbstorage-vol-opts

.travis.yml

@@ -1,4 +1,5 @@
 language: go
+dist: xenial
 sudo: true
 before_install:
     - sudo apt-get update -qq
@@ -16,13 +17,14 @@ git:
   depth: 9999999
 matrix:
   include:
-  - go: 1.8.2
-    env: COVERAGE="true"
   - go: 1.9.4
-    env: COVERAGE="true"
+    name: Test using Go 1.9
   - go: "1.10"
-    env: COVERAGE="true"
+    name: Test using Go 1.10
+  - go: "1.11"
+    name: Test using Go 1.11
+  - go: "1.11"
+    script: make release
+    name: make release on Go 1.11
 script:
-- make
-- if [[ -z "$COVERAGE" ]]; then make test TESTOPTIONS=-v ; else make test TESTOPTIONS=-vcstdout && bash .travis-coverage; fi
-- make release
+- make all test COVERAGE=true TESTOPTIONS="-vcstdout" && bash .travis-coverage

Makefile

@@ -161,7 +161,30 @@ linux_arm64_dist:
 
 release: deps_tarball linux_arm64_dist linux_arm_dist linux_amd64_dist
 
+DESTDIR:=
+prefix:=/usr/local
+bindir:=$(prefix)/bin
+datarootdir:=$(prefix)/share
+hekdir:=$(datarootdir)/heketi
+mandir:=$(datarootdir)/man
+
+INSTALL:=install -D -p
+INSTALL_PROGRAM:=$(INSTALL) -m 0755
+INSTALL_DATA:=$(INSTALL) -m 0644
+install:
+	$(INSTALL_PROGRAM) client/cli/go/heketi-cli \
+		$(DESTDIR)$(bindir)/heketi-cli
+	$(INSTALL_PROGRAM) heketi \
+		$(DESTDIR)$(bindir)/heketi
+	$(INSTALL_DATA) docs/man/heketi-cli.8 \
+		$(DESTDIR)$(mandir)/man8/heketi-cli.8
+	$(INSTALL_PROGRAM) extras/container/heketi-start.sh \
+		$(DESTDIR)$(hekdir)/container/heketi-start.sh
+	$(INSTALL_DATA) extras/container/heketi.json \
+		$(DESTDIR)$(hekdir)/container/heketi.json
+
+
 .PHONY: server client test clean name run version release \
 	linux_arm_dist linux_amd64_dist linux_arm64_dist \
 	heketi clean_vendor deps_tarball all dist \
-	test-functional
+	test-functional install

README.md

@@ -1,4 +1,3 @@
-[![Stories in Ready](https://badge.waffle.io/heketi/heketi.png?label=in%20progress&title=In%20Progress)](https://waffle.io/heketi/heketi)
 [![Build Status](https://travis-ci.org/heketi/heketi.svg?branch=master)](https://travis-ci.org/heketi/heketi)
 [![Coverage Status](https://coveralls.io/repos/heketi/heketi/badge.svg)](https://coveralls.io/r/heketi/heketi)
 [![Go Report Card](https://goreportcard.com/badge/github.com/heketi/heketi)](https://goreportcard.com/report/github.com/heketi/heketi)

apps/glusterfs/allocator_simple_ring_test.go

@@ -10,10 +10,11 @@
 package glusterfs
 
 import (
-	"github.com/heketi/heketi/pkg/idgen"
-	"github.com/heketi/tests"
 	"reflect"
 	"testing"
+
+	"github.com/heketi/heketi/pkg/idgen"
+	"github.com/heketi/tests"
 )
 
 func TestNewSimpleAllocatorRing(t *testing.T) {