Use go 1.7.1 for testing
Updated failed test that specific for duration format in string.pull/7324/head
parent
7e515cf5f7
commit
c70efc8261
|
@ -11,12 +11,12 @@ To build a docker image for InfluxDB from your current checkout, run the followi
|
|||
$ ./build-docker.sh
|
||||
```
|
||||
|
||||
This script uses the `golang:1.5` image to build a fully static binary of `influxd` and then adds it to a minimal `scratch` image.
|
||||
This script uses the `golang:1.7.1` image to build a fully static binary of `influxd` and then adds it to a minimal `scratch` image.
|
||||
|
||||
To build the image using a different version of go:
|
||||
|
||||
```
|
||||
$ GO_VER=1.4.2 ./build-docker.sh
|
||||
$ GO_VER=1.7.1 ./build-docker.sh
|
||||
```
|
||||
|
||||
Available version can be found [here](https://hub.docker.com/_/golang/).
|
||||
|
|
|
@ -18,7 +18,7 @@ RUN gem install fpm
|
|||
|
||||
# Install go
|
||||
ENV GOPATH /root/go
|
||||
ENV GO_VERSION 1.6.2
|
||||
ENV GO_VERSION 1.7.1
|
||||
ENV GO_ARCH 386
|
||||
RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
|
||||
tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \
|
||||
|
|
|
@ -21,7 +21,7 @@ RUN gem install fpm
|
|||
|
||||
# Install go
|
||||
ENV GOPATH /root/go
|
||||
ENV GO_VERSION 1.6.2
|
||||
ENV GO_VERSION 1.7.1
|
||||
ENV GO_ARCH amd64
|
||||
RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
|
||||
tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \
|
||||
|
|
|
@ -26,7 +26,7 @@ VOLUME $PROJECT_DIR
|
|||
|
||||
|
||||
# Install go
|
||||
ENV GO_VERSION 1.6.2
|
||||
ENV GO_VERSION 1.7.1
|
||||
ENV GO_ARCH amd64
|
||||
RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
|
||||
tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
set -e -x
|
||||
|
||||
GO_VER=${GO_VER:-1.4.3}
|
||||
GO_VER=${GO_VER:-1.7.1}
|
||||
|
||||
docker run -it -v "${GOPATH}":/gopath -v "$(pwd)":/app -e "GOPATH=/gopath" -w /app golang:$GO_VER sh -c 'CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o influxd ./cmd/influxd'
|
||||
|
||||
|
|
2
build.py
2
build.py
|
@ -49,7 +49,7 @@ VENDOR = "InfluxData"
|
|||
DESCRIPTION = "Distributed time-series database."
|
||||
|
||||
prereqs = [ 'git', 'go' ]
|
||||
go_vet_command = "go tool vet -example=false ./"
|
||||
go_vet_command = "go tool vet ./"
|
||||
optional_prereqs = [ 'fpm', 'rpmbuild', 'gpg' ]
|
||||
|
||||
fpm_common_args = "-f -s dir --log error \
|
||||
|
|
|
@ -2,7 +2,7 @@ machine:
|
|||
services:
|
||||
- docker
|
||||
environment:
|
||||
GODIST: "go1.6.2.linux-amd64.tar.gz"
|
||||
GODIST: "go1.7.1.linux-amd64.tar.gz"
|
||||
post:
|
||||
- mkdir -p download
|
||||
- test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST
|
||||
|
|
|
@ -464,7 +464,7 @@ func init() {
|
|||
&Query{
|
||||
name: "show retention policies should return auto-created policy",
|
||||
command: `SHOW RETENTION POLICIES ON db0`,
|
||||
exp: `{"results":[{"series":[{"columns":["name","duration","shardGroupDuration","replicaN","default"],"values":[["autogen","0","168h0m0s",1,true]]}]}]}`,
|
||||
exp: `{"results":[{"series":[{"columns":["name","duration","shardGroupDuration","replicaN","default"],"values":[["autogen","0s","168h0m0s",1,true]]}]}]}`,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -527,7 +527,7 @@ func TestServer_Query_DefaultDBAndRP(t *testing.T) {
|
|||
&Query{
|
||||
name: "default rp exists",
|
||||
command: `show retention policies ON db0`,
|
||||
exp: `{"results":[{"series":[{"columns":["name","duration","shardGroupDuration","replicaN","default"],"values":[["autogen","0","168h0m0s",1,false],["rp0","0","168h0m0s",1,true]]}]}]}`,
|
||||
exp: `{"results":[{"series":[{"columns":["name","duration","shardGroupDuration","replicaN","default"],"values":[["autogen","0s","168h0m0s",1,false],["rp0","0s","168h0m0s",1,true]]}]}]}`,
|
||||
},
|
||||
&Query{
|
||||
name: "default rp",
|
||||
|
|
Loading…
Reference in New Issue