From d155d0271e4e3de40387be104f5a8701cea29363 Mon Sep 17 00:00:00 2001
From: armab <st@arma.biz>
Date: Wed, 9 Mar 2016 16:13:13 +0200
Subject: [PATCH] Add support for st2-packages branching

- Autodetect st2-packages branch automatically
- Make sure to suppress `git checkout` error code to avoid race, when remote `st2-packages` branch wasn't yet created
- Fall-back to `st2-packages` master if there is no `vX.Y` branch in packages
---
 circle.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 0cd994d4ff..20ccd092c6 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,7 +21,6 @@ machine:
     DISTROS: "wheezy jessie trusty el6 el7"
     NOTESTS: "el7"
     ST2_PACKAGES_REPO: https://github.com/StackStorm/st2-packages
-    ST2_PACKAGES_BRANCH: master
     ST2_DOCKERFILES_REPO: https://github.com/StackStorm/st2-dockerfiles
     BUILD_DOCKER: 0
     DEPLOY_DOCKER: 0
@@ -40,7 +39,10 @@ machine:
 
 checkout:
   post:
-    - git clone --depth 1 -b ${ST2_PACKAGES_BRANCH} ${ST2_PACKAGES_REPO} /home/ubuntu/st2/st2-packages
+    - |
+      git clone --depth 1 ${ST2_PACKAGES_REPO} /home/ubuntu/st2/st2-packages
+      cd /home/ubuntu/st2/st2-packages
+      git checkout ${CIRCLE_BRANCH} || true
     - .circle/buildenv.sh
 
 dependencies: