refactor packaging scripts

Makefile

@@ -0,0 +1,8 @@
+default:
+	$(MAKE) all
+test:
+	bash -c "./scripts/test.sh $(TEST)"
+check:
+	$(MAKE) test
+all:
+	bash -c "./scripts/build.sh"

scripts/build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -x
+# Find the directory we exist within
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd ${DIR}
+
+GITVERSION=`git describe --always`
+SOURCEDIR=${DIR}/..
+BUILDDIR=$SOURCEDIR/build
+
+# Make dir
+mkdir -p $BUILDDIR
+
+# Clean build bin dir
+rm -rf $BUILDDIR/*
+
+# Build binary
+cd ../
+go build -ldflags "-X main.GitHash=$GITVERSION" -o $BUILDDIR/metric-tank

scripts/depends.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -x
+# Find the directory we exist within
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd ${DIR}
+
+: ${GOPATH:="${HOME}/.go_workspace"}
+: ${ORG_PATH:="github.com/raintank"}
+: ${REPO_PATH:="${ORG_PATH}/metrictank"}
+
+if [ ! -z ${CIRCLECI} ] ; then
+  : ${CHECKOUT:="/home/ubuntu/${CIRCLE_PROJECT_REPONAME}"}
+else
+  : ${CHECKOUT:="${DIR}/.."}
+fi
+
+export GOPATH
+
+bundle install
+
+echo "Linking ${GOPATH}/src/${REPO_PATH} to ${CHECKOUT}"
+mkdir -p ${GOPATH}/src/${ORG_PATH}
+ln -s ${CHECKOUT} ${GOPATH}/src/${REPO_PATH}
+
+cd ${GOPATH}/src/${REPO_PATH}
+go get -t ./...

pkg/deploy.sh → scripts/deploy.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
-
+set -x
 # Find the directory we exist within
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
+ls -l  ${DIR}/../build/*.deb
 if [ -z ${PACKAGECLOUD_REPO} ] ; then
   echo "The environment variable PACKAGECLOUD_REPO must be set."
   exit 1
 fi
 
-package_cloud push ${PACKAGECLOUD_REPO}/ubuntu/trusty ${DIR}/artifacts/*.deb
-git push --tags
+# Only do the ubuntu pkg for now.
+package_cloud push ${PACKAGECLOUD_REPO}/ubuntu/trusty ${DIR}/../build/*.deb

scripts/package.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -x
+BASE=$(dirname $0)
+CODE_DIR=$(readlink -e "$BASE/../")
+
+BUILD=$CODE_DIR/build
+
+ARCH="$(uname -m)"
+VERSION=$(git describe --long --always)
+
+PACKAGE_NAME="${BUILD}/metric_tank-${VERSION}_${ARCH}.deb"
+mkdir -p ${BUILD}/usr/sbin
+mkdir -p ${BUILD}/etc/init
+mkdir -p ${BUILD}/etc/raintank
+
+cp ${BASE}/config/ubuntu/trusty/etc/raintank/metric_tank.ini ${BUILD}/etc/raintank/
+cp ${BASE}/etc/init/raintank-probe.conf ${BUILD}/etc/init
+mv ${BUILD}/raintank-probe ${BUILD}/usr/bin/
+
+fpm -s dir -t deb \
+  -v ${VERSION} -n raintank-probe -a ${ARCH} --description "metrictank, the gorilla-inspired timeseries database backend for graphite" \
+  --deb-upstart ${BASE}/config/ubuntu/trusty/etc/init/metric_tank \
+  -C ${BUILD} -p ${PACKAGE_NAME} .
+