From 681326140d451082c304dfb173e0de5495f5ca58 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 5 Jun 2018 19:11:57 +0100 Subject: [PATCH 1/3] Version the tarball uploaded to s3 and tell the next step about it. Signed-off-by: Tom Wilkie --- .circleci/config.yml | 17 +++++++++++------ scripts/trigger_docker_build.sh | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e898ad9e214..0e026d76236 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -183,16 +183,21 @@ jobs: command: 'sudo pip install awscli' - run: name: deploy to s3 - command: 'aws s3 sync ./dist s3://$BUCKET_NAME/master' + command: | + # Also + cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-${CIRCLE_SHA1:7}.linux-x64.tar.gz + aws s3 sync ./dist s3://$BUCKET_NAME/master - run: name: Trigger Windows build command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master' - run: name: Trigger Docker build - command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}' + command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} master-${CIRCLE_SHA1:7}' - run: name: Publish to Grafana.com - command: './scripts/publish -apiKey ${GRAFANA_COM_API_KEY}' + command: | + rm dist/grafana-master-${CIRCLE_SHA1:7}.linux-x64.tar.gz + ./scripts/publish -apiKey ${GRAFANA_COM_API_KEY} deploy-release: docker: @@ -240,9 +245,9 @@ workflows: - gometalinter - mysql-integration-test - postgres-integration-test - filters: - branches: - only: master + #filters: + # branches: + # only: master release: jobs: - build-all: diff --git a/scripts/trigger_docker_build.sh b/scripts/trigger_docker_build.sh index 5ca9c0b88c8..e639c50e54c 100755 --- a/scripts/trigger_docker_build.sh +++ b/scripts/trigger_docker_build.sh @@ -3,7 +3,7 @@ _circle_token=$1 _grafana_version=$2 -trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-docker/tree/master?circle-token=${_circle_token} +trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-docker/tree/deploy?circle-token=${_circle_token} post_data=$(cat < Date: Wed, 6 Jun 2018 12:07:47 +0100 Subject: [PATCH 2/3] Use cut to trim down the SHA1. Signed-off-by: Tom Wilkie --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e026d76236..55ac17b651d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,18 +185,18 @@ jobs: name: deploy to s3 command: | # Also - cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-${CIRCLE_SHA1:7}.linux-x64.tar.gz + cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz aws s3 sync ./dist s3://$BUCKET_NAME/master - run: name: Trigger Windows build command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master' - run: name: Trigger Docker build - command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} master-${CIRCLE_SHA1:7}' + command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} master-$(echo "${CIRCLE_SHA1}" | cut -b1-7)' - run: name: Publish to Grafana.com command: | - rm dist/grafana-master-${CIRCLE_SHA1:7}.linux-x64.tar.gz + rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz ./scripts/publish -apiKey ${GRAFANA_COM_API_KEY} deploy-release: From 484d9e3f9da40f21f9477e5a9e713c0536acd486 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 8 Jun 2018 12:44:01 +0200 Subject: [PATCH 3/3] triggers grafana-docker master build --- .circleci/config.yml | 6 +++--- scripts/trigger_docker_build.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 55ac17b651d..465be85d508 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -245,9 +245,9 @@ workflows: - gometalinter - mysql-integration-test - postgres-integration-test - #filters: - # branches: - # only: master + filters: + branches: + only: master release: jobs: - build-all: diff --git a/scripts/trigger_docker_build.sh b/scripts/trigger_docker_build.sh index e639c50e54c..5ca9c0b88c8 100755 --- a/scripts/trigger_docker_build.sh +++ b/scripts/trigger_docker_build.sh @@ -3,7 +3,7 @@ _circle_token=$1 _grafana_version=$2 -trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-docker/tree/deploy?circle-token=${_circle_token} +trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-docker/tree/master?circle-token=${_circle_token} post_data=$(cat <