From 92acda68a1f83f4d9e8a6a90991b9f43d7e81a1e Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 28 Jan 2021 15:59:22 -0600
Subject: [PATCH] use virtualenv flag to use pinned pip

---
 .../0001-pin-python2.7-tests-to-st2-3.3.patch | 27 +++++++++++++++++++
 .circle/dependencies                          |  7 ++---
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 .circle/0001-pin-python2.7-tests-to-st2-3.3.patch

diff --git a/.circle/0001-pin-python2.7-tests-to-st2-3.3.patch b/.circle/0001-pin-python2.7-tests-to-st2-3.3.patch
new file mode 100644
index 00000000..f17cadf6
--- /dev/null
+++ b/.circle/0001-pin-python2.7-tests-to-st2-3.3.patch
@@ -0,0 +1,27 @@
+From 054508235bc3a3174ccc074c92829c206f2afb78 Mon Sep 17 00:00:00 2001
+From: Jacob Floyd <cognifloyd@gmail.com>
+Date: Thu, 28 Jan 2021 12:08:33 -0600
+Subject: [PATCH] pin python2.7 tests to st2 3.3
+
+StackStorm 3.3 is the last version to support 2.7. So, use the v3.3
+branch instead of the master branch for the python 2.7 tests.
+---
+ .circle/circle.yml.sample | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/.circle/circle.yml.sample b/.circle/circle.yml.sample
+index 88a0ece..7168dc8 100644
+--- a/.circleci/config.yml
++++ b/.circleci/config.yml
+@@ -14,6 +14,8 @@ jobs:
+       # Don't install various StackStorm dependencies which are already
+       # installed by CI again in the various check scripts
+       ST2_INSTALL_DEPS: "0"
++      # 3.3 is the last version to support python27
++      ST2_BRANCH: "v3.3"
+ 
+     steps:
+       - checkout
+-- 
+2.26.2
+
diff --git a/.circle/dependencies b/.circle/dependencies
index 74d98222..aa8f2b8e 100755
--- a/.circle/dependencies
+++ b/.circle/dependencies
@@ -36,13 +36,10 @@ sudo apt-get -y install libldap2-dev libsasl2-dev
 PIP_DEP="pip==20.0.2"
 sudo pip install -U "${PIP_DEP}" setuptools virtualenv
 
-virtualenv ~/virtualenv
+# make sure virtualenv is built with same pip version
+virtualenv --pip "${PIP_DEP}" ~/virtualenv
 source ~/virtualenv/bin/activate
 
-# virtualenv is updating pip. Revert back to our pinned version.
-pip install -U "${PIP_DEP}"
-pip --version
-
 # Install StackStorm requirements
 echo "Installing StackStorm requirements from /tmp/st2/requirements.txt"
 ~/virtualenv/bin/pip install -r "/tmp/st2/requirements.txt"