From 109584bfffa2aae0270de9f5bc802ab526f68f50 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Sat, 25 Jul 2020 18:23:39 -0700
Subject: [PATCH 1/4] Bump version in npm-shrinkwrap.json

---
 npm-shrinkwrap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 9f9c2d4..a0d7b2c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "st2-hubot",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

From fcac03512cef70b4c2f6797bb40c1882d46ad00a Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Sat, 25 Jul 2020 20:40:30 -0700
Subject: [PATCH 2/4] Pull st2-packages and st2-docker branches from
 environment variables

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 63a0289..f873a7b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,8 @@ jobs:
     - run:
         name: Get repos and dependencies
         command: |
-          git clone --depth 1 ${ST2_PACKAGES_REPO} ~/st2-packages
-          git clone --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
+          git clone --branch ${ST2_PACKAGES_BRANCH:-master} --depth 1 ${ST2_PACKAGES_REPO} ~/st2-packages
+          git clone --branch ${ST2_DOCKER_BRANCH:-master} --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
           make -C ~/st2-docker env
           sudo apt-get update -qq && sudo apt-get install -y rpm jq
           gem install package_cloud

From fa2d29de2ff60ca94ffe8c62aecc600ac2706c4b Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Thu, 30 Jul 2020 14:41:51 -0700
Subject: [PATCH 3/4] Switch default st2-docker branch to DEPRECATED/all-in-one

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f873a7b..0b4b51c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,7 +22,7 @@ jobs:
         name: Get repos and dependencies
         command: |
           git clone --branch ${ST2_PACKAGES_BRANCH:-master} --depth 1 ${ST2_PACKAGES_REPO} ~/st2-packages
-          git clone --branch ${ST2_DOCKER_BRANCH:-master} --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
+          git clone --branch ${ST2_DOCKER_BRANCH:-DEPRECATED/all-in-one} --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
           make -C ~/st2-docker env
           sudo apt-get update -qq && sudo apt-get install -y rpm jq
           gem install package_cloud

From 37760f8ef6005d27156c9785b752652dfeeb2837 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Thu, 30 Jul 2020 14:43:11 -0700
Subject: [PATCH 4/4] Print the branches we're cloning and comment why we're
 using the DEPRECATED/all-in-one branch of st2-docker

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b4b51c..a2f1618 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,11 @@ jobs:
     - run:
         name: Get repos and dependencies
         command: |
+          echo "Cloning ${ST2_PACKAGES_BRANCH:-master} branch of st2-packages"
           git clone --branch ${ST2_PACKAGES_BRANCH:-master} --depth 1 ${ST2_PACKAGES_REPO} ~/st2-packages
+          # Use DEPRECATED/all-in-one for now, we'll have to circle back around
+          # and fix this to use the master branch
+          echo "Cloning ${ST2_DOCKER_BRANCH:-DEPRECATED/all-in-one} branch of st2-docker"
           git clone --branch ${ST2_DOCKER_BRANCH:-DEPRECATED/all-in-one} --depth 1 ${ST2_TEST_ENVIRONMENT} ~/st2-docker
           make -C ~/st2-docker env
           sudo apt-get update -qq && sudo apt-get install -y rpm jq