openstack/devstack
Code Issues Proposed changes

Merge "Revert "Install python3.6 on ubuntu xenial for Tempest venv"" into stable/rocky

Browse Source
This commit is contained in:
Zuul
2020-02-14 14:23:14 +00:00
committed by Gerrit Code Review
parent 3b404dfb9b 8599320654
commit 721d8c8bb5
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tempest
View File

@@ -703,13 +703,6 @@ function install_tempest {
export UPPER_CONSTRAINTS_FILE=$REQUIREMENTS_DIR/upper-constraints.txt
tox -r --notest -efull
local ver
ver=$(tox -evenv-tempest -- python --version)
echo Python version installed in Tempest venv: $ver
if python3_enabled; then
ver=$(tox -evenv-tempest -- python3 --version)
echo Python3 version installed in Tempest venv: $ver
fi
# NOTE(mtreinish) Respect constraints in the tempest full venv, things that
# are using a tox job other than full will not be respecting constraints but
# running pip install -U on tempest requirements

22
tools/fixup_stuff.sh
View File

@@ -238,32 +238,10 @@ function fixup_virtualenv {
fi
}
# Ubuntu Xenial with py3.6
#-------------------------
# Install py3.6 on Xenial for Tempest
function fixup_tempest_on_xenial {
# All the stable branches are tested with Tempest and its plugins master
# branch. In ussuri cycle, openstack is dropping the py2.7 support which
# make Tempest & its plugin not able to run on py2.7 or sometime <py3.6
# venv for code or dependency version compatibility reason
# (Example: bug#1860033). Tempest is being installed and run on venv
# which give us flexibility to run with any interpreter irrespective of
# tested env python version. Stable branches till stable/rocky use
# ubuntu xenial which does not have py3.6 and so does need to be
# installed separately.
if [[ "$DISTRO" == "xenial" ]]; then
echo "Installing python 3.6 from ppa"
sudo add-apt-repository ppa:deadsnakes/ppa --yes
sudo apt-get update
sudo apt-get install python3.6 python3.6-dev --yes
fi
}
function fixup_all {
fixup_keystone
fixup_uca
fixup_python_packages
fixup_fedora
fixup_virtualenv
fixup_tempest_on_xenial
}