summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBrian Rosmaita <rosmaita.fossdev@gmail.com>2018-03-15 20:32:40 -0400
committerBrian Rosmaita <rosmaita.fossdev@gmail.com>2018-03-28 22:32:44 -0400
commit32b83078194f40e0d3445d95cf04ce97091fd229 (patch)
tree4dd3856a7847b6f88a9c6d04a34c340199917cff /tools
parent4cb8b030623ec3980f3897e8b5c0f4d20acff2ed (diff)
downloadpython-glanceclient-32b83078194f40e0d3445d95cf04ce97091fd229.tar.gz
Split glanceclient functional tests
Prepare for the Image API v1 to be removed from glance during Rocky by splitting the functional tests that hit v1 from the tests that hit v2. Introduce a new job that runs the functional-v1 tests against a devstack running glance stable/queens, and configure this job for both check and gate for the glanceclient. The v2 functional tests continue to be run for both check and gate against a devstack running glance master. Change-Id: Ifa98ada26a84e4cca3ea8c98173f61a6174cca27
Diffstat (limited to 'tools')
-rwxr-xr-xtools/fix_ca_bundle.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/fix_ca_bundle.sh b/tools/fix_ca_bundle.sh
index 8e3dba2..cd35d8d 100755
--- a/tools/fix_ca_bundle.sh
+++ b/tools/fix_ca_bundle.sh
@@ -6,10 +6,12 @@
# assumptions:
# - devstack is running
# - the devstack tls-proxy service is running
+# - the environment var OS_TESTENV_NAME is set in tox.ini (defaults
+# to 'functional'
#
# This code based on a function in devstack lib/tls
function set_ca_bundle {
- local python_cmd='.tox/functional/bin/python'
+ local python_cmd=".tox/${OS_TESTENV_NAME:-functional}/bin/python"
local capath=$($python_cmd -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass')
# of course, each distro keeps the CA store in a different location
local fedora_CA='/etc/pki/tls/certs/ca-bundle.crt'