From a634bd0ce8d2b8bf005b8bf940350f7d26a7cac8 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 24 Jan 2017 16:14:01 +0100
Subject: [PATCH] tech(build): sign and deploy packages to s3

---
 circle.yml                     | 7 ++++---
 scripts/build/rpmmacros        | 4 ++++
 scripts/build/sign_packages.sh | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 scripts/build/rpmmacros

diff --git a/circle.yml b/circle.yml
index 5bc6dc7dae4..0236e608969 100644
--- a/circle.yml
+++ b/circle.yml
@@ -37,8 +37,9 @@ deployment:
       - pip install awscli
       - ./scripts/build/build_container.sh
       - ./scripts/build/deploy.sh
+      - sudo apt-get update; sudo apt-get install rpm; sudo apt-get install expect
       - ./scripts/build/sign_packages.sh
-      - aws s3 sync ./dist s3://$NIGHTLY_BUCKET_NAME
+      - aws s3 sync ./dist s3://$BUCKET_NAME/master
       #- ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN}
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
@@ -48,7 +49,7 @@ deployment:
       - pip install awscli
       - ./scripts/build/build_container.sh
       - ./scripts/build/deploy.sh
-      #- ./scripts/build/sign_packages.sh
-      #- aws s3 sync ./dist s3://$BUCKET_NAME
+      - ./scripts/build/sign_packages.sh
+      - aws s3 sync ./dist s3://$BUCKET_NAME/release
       #- ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN}
 
diff --git a/scripts/build/rpmmacros b/scripts/build/rpmmacros
new file mode 100644
index 00000000000..a91ba9b8290
--- /dev/null
+++ b/scripts/build/rpmmacros
@@ -0,0 +1,4 @@
+%_signature gpg
+%_gpg_path /home/ubuntu/.gnupg
+%_gpg_name Grafana
+%_gpgbin /usr/bin/gpg
diff --git a/scripts/build/sign_packages.sh b/scripts/build/sign_packages.sh
index cca018fb83a..a936e68e3b1 100755
--- a/scripts/build/sign_packages.sh
+++ b/scripts/build/sign_packages.sh
@@ -4,6 +4,6 @@ git clone git@github.com:torkelo/private.git ~/private-repo
 
 gpg --allow-secret-key-import --import ~/private-repo/signing/private.key
 
-cp rpmmacros ~/.rpmmacros
+cp ./scripts/build/rpmmacros ~/.rpmmacros
 
 ./scripts/build/sign_expect $GPG_KEY_PASSWORD dist/*.rpm