openstack/manila
Code Issues Proposed changes

[tests] Fix PYTHON3_VERSION

Browse Source 
The pre test hook for gate tests has a faulty test
for whether the PYTHON3_VERSION variable is set and
as a result puts a blank value for this variable in
local.conf when it is not set instead of leaving it
out of local.conf altogether.  This causes jobs
running with USE_PYTHON3=True and no explict version
setting to actually run manila under python 2.7 because
that is what devstack itself defaults for pip installs
if the version is not set (or auto-detected in devstack
when local.conf does not contain the PYTHON3_VERSION
variable at all).

So correct the condition in our pre-test hook so that
it only inserts a PYTHON3_VERSION in local.conf if
that version has been supplied.

Closes-bug: #1822178
Change-Id: Ie37595bde17d18770d82fb7fd6475dcfab74a543
This commit is contained in:
Tom Barron 2019-03-28 14:46:06 -04:00
parent 04fd2c02ed
commit d5bd526f11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ci/pre_test_hook.sh
View File

@ -29,8 +29,8 @@ echo "VOLUME_BACKING_FILE_SIZE=22G" >> $localconf
echo "CINDER_LVM_TYPE=thin" >> $localconf echo "CINDER_LVM_TYPE=thin" >> $localconf
# Set DevStack's PYTHON3_VERSION variable if CI scripts specify it # Set DevStack's PYTHON3_VERSION variable if CI scripts specify it
if ! [[ -z "PYTHON3_VERSION" ]]; then if [[ ! -z "$PYTHON3_VERSION" ]]; then
echo "PYTHON3_VERSION=$PYTHON3_VERSION" >> $localconf echo "PYTHON3_VERSION=$PYTHON3_VERSION" >> $localconf
fi fi
# NOTE(mkoderer): switch to keystone v3 by default # NOTE(mkoderer): switch to keystone v3 by default