From fd72a14186470d814ef2435c7ff569dc6a1eebda Mon Sep 17 00:00:00 2001
From: "Dave Wilde (d34dh0r453)" <david.wilde@rackspace.com>
Date: Thu, 28 Feb 2019 15:12:08 -0600
Subject: [PATCH] [RI-675] Pin OSA_TEST_RELEASE and OSA_UPPER_CONSTRAINTS

Due to ongoing upstream improvements we need to pin the
OSA_TEST_RELEASE and OSA_UPPER_CONSTRAINS that we're using for
linting via tox. This adds both of those variables to functions.sh
as well as provides the ability to specify SHAs via the command-line.

JIRA: RI-675

based-on: 1997378f144fea2ad8e2729c0c25a8f383812ccb
(cherry picked from commit ec15dc13ee29a2da34fd16139e2aa32dd9bdc91a)
---
 gating/gating_vars.sh |  6 ++++++
 tox.ini               | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gating/gating_vars.sh b/gating/gating_vars.sh
index 0abe023ed..939179d4c 100644
--- a/gating/gating_vars.sh
+++ b/gating/gating_vars.sh
@@ -10,3 +10,9 @@ export RE_HOOK_ARTIFACT_DIR="${RE_HOOK_ARTIFACT_DIR:-/tmp/artifacts}"
 export RE_HOOK_RESULT_DIR="${RE_HOOK_RESULT_DIR:-/tmp/results}"
 export RE_JOB_NAME="${RE_JOB_NAME:-${RE_JOB_TRIGGER}_rpc-openstack-master-${RE_JOB_IMAGE}_no_artifacts-${RE_JOB_SCENARIO}-${RE_JOB_ACTION}}"
 export RE_JOB_PROJECT_NAME="${RE_JOB_PROJECT_NAME:-}"
+
+# OSA Tests SHA
+# # These variables pin the SHA for the OSA Testing repository
+export OSA_TEST_RELEASE=${OSA_TEST_RELEASE:-stable/pike}
+export OSA_UPPER_CONSTRAINTS=${OSA_UPPER_CONSTRAINTS:-stable/pike}
+
diff --git a/tox.ini b/tox.ini
index fdc1950b9..bb1095002 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,8 +31,9 @@ setenv =
     # NOTE(cloudnull): This should be set to "master" as soon the gate is capable of
     #                  setting this option.
     OSA_RELEASE_BRANCH={env:OSA_RELEASE_BRANCH:stable/pike}
-    OSA_TEST_RELEASE=stable/pike
-    UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_TEST_RELEASE:master}
+    OSA_TEST_RELEASE={env:OSA_TEST_RELEASE:master}
+    OSA_UPPER_CONSTRAINTS={env:OSA_UPPER_CONSTRAINTS:master}
+    UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={env:OSA_UPPER_CONSTRAINTS:master}
     OSA_TEST_DEPS=https://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h={env:OSA_TEST_RELEASE:master}
     OSA_ROLE_REQUIREMENTS=https://git.openstack.org/cgit/openstack/openstack-ansible/plain/ansible-role-requirements.yml?h={env:OSA_RELEASE_BRANCH:master}
 basepython = python2.7
@@ -76,6 +77,11 @@ commands =
                pushd {toxinidir}/tests/common; \
                  git checkout {env:OSA_TEST_RELEASE:master}; \
                popd; \
+             else \
+               pushd {toxinidir}/tests/common; \
+                 git fetch origin; \
+                 git checkout {env:OSA_TEST_RELEASE:master}; \
+               popd; \
              fi"