Merge pull request #128 from thom8/deploy

Update deploy.sh to use current branch/tag for atlas build.

circle.yml

@@ -7,30 +7,30 @@ machine:
     BEET_HOME: /beetbox
     BEET_BASE: /var/beetbox
     BEET_USER: ubuntu
-    BEET_DEPLOY: ~/$CIRCLE_PROJECT_REPONAME/provisioning/deploy.sh
+    BEET_DEPLOY: provisioning/deploy.sh
+    BEET_PROVISION: provisioning/beetbox.sh
     INSTALL_PACKER: true
 dependencies:
   pre:
     - sudo cp -rf ~/$CIRCLE_PROJECT_REPONAME $BEET_HOME
-    - sudo chmod +x $BEET_HOME/provisioning/beetbox.sh
-    - $BEET_HOME/provisioning/beetbox.sh
+    - sudo chmod +x $BEET_HOME/$BEET_PROVISION
+    - $BEET_HOME/$BEET_PROVISION
 test:
   override:
     - sudo cp -rf $BEET_HOME/* $BEET_BASE
     - sudo cp ~/$CIRCLE_PROJECT_REPONAME/.beetbox/config.yml $BEET_HOME/provisioning/ansible/vagrant.config.yml
-    - $BEET_HOME/provisioning/beetbox.sh
+    - $BEET_HOME/$BEET_PROVISION
 deployment:
   dev:
-    branch: dev
+    branch: master
     owner: drupalmel
     commands:
-      - chmod +x $BEET_DEPLOY
-      - $BEET_DEPLOY
+      - chmod +x $BEET_HOME/$BEET_DEPLOY ; $BEET_HOME/$BEET_DEPLOY
   release:
     tag: /[0-9]+\.[0-9]+\.[0-9]+/
     owner: drupalmel
     commands:
-      - chmod +x $BEET_DEPLOY
-      - BEET_VERSION="$CIRCLE_TAG" $BEET_DEPLOY
-      - BEET_VERSION="$CIRCLE_TAG" BEET_TEMPLATE=template-14.04.json $BEET_DEPLOY
-      - BEET_VERSION="$CIRCLE_TAG" BEET_TEMPLATE=template-12.04.json $BEET_DEPLOY
+      - chmod +x $BEET_HOME/$BEET_DEPLOY
+      - $BEET_HOME/$BEET_DEPLOY
+      - BEET_TEMPLATE=template-14.04.json $BEET_HOME/$BEET_DEPLOY
+      - BEET_TEMPLATE=template-12.04.json $BEET_HOME/$BEET_DEPLOY

provisioning/deploy.sh

@@ -1,19 +1,24 @@
-#!/bin/bash -eu
+#!/bin/bash -e
 
 # Set default environment variables.
 ATLAS_BOX="$BEET_BOX-dev"
-BEET_VERSION=${BEET_VERSION:-"0.1.$CIRCLE_BUILD_NUM"}
+ATLAS_VERSION=${BEET_VERSION:-"0.1.$CIRCLE_BUILD_NUM"}
+BEET_VERSION=${CIRCLE_BRANCH:-"dev"}
 BEET_TEMPLATE=${BEET_TEMPLATE:-"template.json"}
-PACKER_HOME=${PACKER_HOME:-"~/$CIRCLE_PROJECT_REPONAME/provisioning"}
+PACKER_HOME=${PACKER_HOME:-"$BEET_HOME/provisioning"}
 
 # Use prod atlas build and tag for version.
-if [ $CIRCLE_TAG ]; then
+if [ ! $CIRCLE_TAG = "" ]; then
   ATLAS_BOX="$BEET_BOX"
+  ATLAS_VERSION="$CIRCLE_TAG"
   BEET_VERSION="$CIRCLE_TAG"
 fi
 
+cd $PACKER_HOME
+
 # Update template variables.
+sed -i "s/ATLAS_VERSION/$ATLAS_VERSION/" $BEET_TEMPLATE
 sed -i "s/BEET_VERSION/$BEET_VERSION/" $BEET_TEMPLATE
 
 # Trigger new build.
-cd $PACKER_HOME ; packer push -token=$ATLAS_TOKEN -name="$ATLAS_BOX" $BEET_TEMPLATE
+packer push -token=$ATLAS_TOKEN -name="$ATLAS_BOX" $BEET_TEMPLATE

provisioning/template-12.04.json

@@ -1,13 +1,13 @@
 {
   "variables": {
-    "version": "BEET_VERSION",
+    "version": "ATLAS_VERSION",
     "atlas_username": "{{env `ATLAS_BUILD_USERNAME`}}",
     "atlas_name": "{{env `ATLAS_BUILD_NAME`}}",
     "hostname": "beetbox.local",
     "ssh_name": "vagrant",
     "ssh_pass": "vagrant",
     "beet_repo": "https://github.com/DrupalMel/beetbox.git",
-    "beet_version": "master",
+    "beet_version": "BEET_VERSION",
     "iso_url": "http://releases.ubuntu.com/precise/ubuntu-12.04.5-server-amd64.iso",
     "iso_checksum": "af224223de99e2a730b67d7785b657f549be0d63221188e105445f75fb8305c9"
   },

provisioning/template-14.04.json

@@ -1,13 +1,13 @@
 {
   "variables": {
-    "version": "BEET_VERSION",
+    "version": "ATLAS_VERSION",
     "atlas_username": "{{env `ATLAS_BUILD_USERNAME`}}",
     "atlas_name": "{{env `ATLAS_BUILD_NAME`}}",
     "hostname": "beetbox.local",
     "ssh_name": "vagrant",
     "ssh_pass": "vagrant",
     "beet_repo": "https://github.com/DrupalMel/beetbox.git",
-    "beet_version": "master",
+    "beet_version": "BEET_VERSION",
     "iso_url": "http://releases.ubuntu.com/trusty/ubuntu-14.04.3-server-amd64.iso",
     "iso_checksum": "a3b345908a826e262f4ea1afeb357fd09ec0558cf34e6c9112cead4bb55ccdfb"
   },

provisioning/template.json

@@ -1,14 +1,13 @@
 {
   "variables": {
-    "version": "BEET_VERSION",
+    "version": "ATLAS_VERSION",
     "atlas_username": "{{env `ATLAS_BUILD_USERNAME`}}",
     "atlas_name": "{{env `ATLAS_BUILD_NAME`}}",
     "hostname": "beetbox.local",
     "ssh_name": "vagrant",
     "ssh_pass": "vagrant",
     "beet_repo": "https://github.com/DrupalMel/beetbox.git",
-    "beet_version": "master",
-    "beet_tag": "",
+    "beet_version": "BEET_VERSION",
     "iso_url": "http://releases.ubuntu.com/trusty/ubuntu-14.04.3-server-amd64.iso",
     "iso_checksum": "a3b345908a826e262f4ea1afeb357fd09ec0558cf34e6c9112cead4bb55ccdfb"
   },