From 6b90587d274bc5e37bb71f8f2a815135419b08dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 16 Aug 2016 10:22:16 +0200 Subject: [PATCH] feat(alerting): fixing failing go unit test --- packaging/release_process.md | 18 +++++++++++++++++- pkg/services/alerting/conditions/query_test.go | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packaging/release_process.md b/packaging/release_process.md index 645a86d8f4a..6037a9c499c 100644 --- a/packaging/release_process.md +++ b/packaging/release_process.md @@ -3,11 +3,27 @@ ## Building release packages 1) Update package.json so that it has the right version. +2) Create a git tag for the release: `git tag -a v3.0.4 -m "3.0.4 release"` +3) Push branch & tag to github! 2) Packages from master a built automatically by circle CI for this repo [grafana/grafana-packer](https://github.com/grafana/grafana-packer) ### Non master branch When building from non master branch create a new branch in repo [grafana/grafana-packer](https://github.com/grafana/grafana-packer) -and configure circle.yml to deploy that branch as well, https://github.com/grafana/grafana-packer/blob/master/circle.yml#L25 +and configure circle.yml to deploy that branch as well, https://github.com/grafana/grafana-packer/blob/master/circle.yml#L25, +you also need to update https://github.com/grafana/grafana-packer/blob/v3.1.x/deploy.sh#L7. + +### Windows build + +Sign into ci.appveyor.com and the Grafana project's build history page. Builds for windows take a long time (around 20min) +and fail quite often for random reasons so I usually continue with the release process without a windows build already built. + +1) Click on the green build that has the correct version and tag +2) Click on `DEPLOYMENTS` +3) Click on `NEW DEPLOYMENT` +4) Select GrafanaBuildS3 +4) Select the build you want to deploy. + +The deployment should be quick (just uploads the release zip file to S3) diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go index f12562dec0b..1cf1742d762 100644 --- a/pkg/services/alerting/conditions/query_test.go +++ b/pkg/services/alerting/conditions/query_test.go @@ -18,7 +18,7 @@ func TestQueryCondition(t *testing.T) { queryConditionScenario("Given avg() and > 100", func(ctx *queryConditionTestContext) { ctx.reducer = `{"type": "avg"}` - ctx.evaluator = `{"type": "gt "params": [100]}` + ctx.evaluator = `{"type": "gt", "params": [100]}` Convey("Can read query condition from json model", func() { ctx.exec()