From 0b596470c8f7196a5e8e42faaa02db0ecefcf80d Mon Sep 17 00:00:00 2001
From: Ghanshyam <gmann@ghanshyammann.com>
Date: Mon, 20 Jan 2020 12:11:44 -0600
Subject: [PATCH] Install python3.6 on ubuntu xenial for Tempest venv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Stable/Rocky and Stable/Queens use ubuntu xenial for
gate which does not have python3.6 interpreter.

As OpenStack is dropping the python2 support, many dependencies
of Tempest and its plugins need py3.6 interpreter.
For Example: neutron-lib latest release Bug#1860033.

This installs python3.6 and makes it available in Tempest venv
so that Tempest master can keep testing the stable branch.
py3.6 provided by ppa.

Stein onwards distro ver (bionic) has py3.6 so no issue there.

Closes-Bug: 1860033
Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Change-Id: I143b5d9b5cbe9a3c3f0d749badf2b6332a753fb5
---
 lib/tempest          |  7 +++++++
 tools/fixup_stuff.sh | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/lib/tempest b/lib/tempest
index b1d9daace4..d116f847c5 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -690,6 +690,13 @@ function install_tempest {
     pip_install 'tox!=2.8.0'
     pushd $TEMPEST_DIR
     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
diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh
index 914793245e..f909b01793 100755
--- a/tools/fixup_stuff.sh
+++ b/tools/fixup_stuff.sh
@@ -234,10 +234,32 @@ 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
 }