forked from TrueCloudLab/distribution
Ensure that rados is disabled without build tag
This ensures that rados is not required when building the registry. This was slightly tricky in that when the flags were applied, the rados package was completely missing. This led to a problem where rados was basically unlistable and untestable as a package. This was fixed by simply adding a doc.go file that is included whether rados is built or not. Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
parent
3ea67df373
commit
b65a4a8713
4 changed files with 8 additions and 2 deletions
|
@ -102,8 +102,7 @@ test:
|
||||||
- echo "$CIRCLE_PAIN" > ~/goverage.report
|
- echo "$CIRCLE_PAIN" > ~/goverage.report
|
||||||
- gvm use stable; go list ./... | xargs -L 1 -I{} rm -f $GOPATH/src/{}/coverage.out:
|
- gvm use stable; go list ./... | xargs -L 1 -I{} rm -f $GOPATH/src/{}/coverage.out:
|
||||||
pwd: $BASE_STABLE
|
pwd: $BASE_STABLE
|
||||||
|
- gvm use stable; go list -tags "$DOCKER_BUILDTAGS" ./... | xargs -L 1 -I{} godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/{}/coverage.out {}:
|
||||||
- gvm use stable; go list ./... | xargs -L 1 -I{} godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/{}/coverage.out {}:
|
|
||||||
timeout: 600
|
timeout: 600
|
||||||
pwd: $BASE_STABLE
|
pwd: $BASE_STABLE
|
||||||
|
|
||||||
|
|
3
registry/storage/driver/rados/doc.go
Normal file
3
registry/storage/driver/rados/doc.go
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
// Package rados implements the rados storage driver backend. Support can be
|
||||||
|
// enabled by including the "include_rados" build tag.
|
||||||
|
package rados
|
|
@ -1,3 +1,5 @@
|
||||||
|
// +build include_rados
|
||||||
|
|
||||||
package rados
|
package rados
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
// +build include_rados
|
||||||
|
|
||||||
package rados
|
package rados
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|
Loading…
Reference in a new issue