From 4d6bce9a4c123d0f12b3609e51e124e96c380e01 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 27 Apr 2017 15:09:46 -0700 Subject: [PATCH 1/7] Use go 1.8.1 for CI and Release builds --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index a7d15368d5c87..d7268643c512e 100644 --- a/circle.yml +++ b/circle.yml @@ -5,8 +5,8 @@ machine: - sudo service zookeeper stop - go version - sudo rm -rf /usr/local/go - - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz - - sudo tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz + - wget https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz + - sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz - go version dependencies: From 5c2079dc6e2539b38249488024ac1a3ce0d4fd52 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 27 Apr 2017 15:29:21 -0700 Subject: [PATCH 2/7] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 717642528048c..7d66ee661ad7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,7 @@ be deprecated eventually. - [#2705](https://github.com/influxdata/telegraf/pull/2705): Kinesis output: add use_random_partitionkey option - [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer - [#2031](https://github.com/influxdata/telegraf/pull/2031): Add Kapacitor input plugin +- [#2732](https://github.com/influxdata/telegraf/pull/2732): Use go 1.8.1 ### Bugfixes From f525ef006c935be420aa5d8c2485f6e083cef1c5 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 27 Apr 2017 15:35:40 -0700 Subject: [PATCH 3/7] Empty commit to trigger circleci to use Ubuntu 14.04 image From a82a915fd3bc295785a1a923d39e0d4e2c36ce92 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 27 Apr 2017 15:38:59 -0700 Subject: [PATCH 4/7] Remove zookeeper stop in circleci --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index d7268643c512e..3908ec1a9e3c5 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,6 @@ machine: services: - docker post: - - sudo service zookeeper stop - go version - sudo rm -rf /usr/local/go - wget https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz From e008ef63028636927e1a79edef6da6d929829daf Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 27 Apr 2017 15:45:36 -0700 Subject: [PATCH 5/7] Use circleci go build --- circle.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/circle.yml b/circle.yml index 3908ec1a9e3c5..3ae7c31689457 100644 --- a/circle.yml +++ b/circle.yml @@ -1,12 +1,8 @@ machine: + go: + version: 1.8.1 services: - docker - post: - - go version - - sudo rm -rf /usr/local/go - - wget https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz - - sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz - - go version dependencies: override: From 2ee69981f5b930ea4f819f00ec5f075a065c103d Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 27 Apr 2017 16:00:26 -0700 Subject: [PATCH 6/7] Add required services not started by 14.04 image --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/circle.yml b/circle.yml index 3ae7c31689457..1db75a8dc00c7 100644 --- a/circle.yml +++ b/circle.yml @@ -3,6 +3,9 @@ machine: version: 1.8.1 services: - docker + - memcached + - redis + - rabbitmq dependencies: override: From dba37a93897d41f5b426e67a21edeac60db962d4 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Thu, 27 Apr 2017 16:04:53 -0700 Subject: [PATCH 7/7] Fix rabbitmq-server service name --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1db75a8dc00c7..3982c1036c627 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: - docker - memcached - redis - - rabbitmq + - rabbitmq-server dependencies: override: