Merge "Switch Fips fullstack/functional tests to py3.8"

roles/configure_functional_tests/tasks/main.yaml

@@ -20,6 +20,7 @@
         INSTALL_OVN={{ INSTALL_OVN }}
         # This is DB USER used in e.g. pgsql db
         DATABASE_USER=openstack_citest
+        MYSQL_GATHER_PERFORMANCE={{ MYSQL_GATHER_PERFORMANCE | default(true) }}
 
         source $DEVSTACK_PATH/functions
         source $DEVSTACK_PATH/lib/neutron_plugins/ovn_agent
@@ -34,6 +35,9 @@
             # NOTE(slaweq) On Fedora/CentOS systems make sure that SELinux is
             # not in enforcing mode
             sudo setenforce 0
+            if [[ $os_VENDOR == "CentOSStream" && $os_RELEASE -eq 8 ]]; then
+                install_package python3.8 python38-devel
+            fi
         fi
 
         configure_host_for_func_testing

tox.ini

@@ -5,7 +5,7 @@ skipsdist = True
 ignore_basepython_conflict = True
 
 [testenv]
-basepython = python3
+basepython = {env:TOX_PYTHON:python3}
 setenv = VIRTUAL_ENV={envdir}
          OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
          OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}

zuul.d/base.yaml

@@ -141,6 +141,11 @@
       Functional testing for a FIPS enabled Centos 8 system
     vars:
       enable_fips: True
+      # NOTE(ykarel) Remove MYSQL_GATHER_PERFORMANCE and
+      # tox_environment when this job switches to centos-9-stream
+      MYSQL_GATHER_PERFORMANCE: false
+      tox_environment:
+        TOX_PYTHON: python3.8
       devstack_localrc:
         ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
         Q_BUILD_OVS_FROM_GIT: true
@@ -153,6 +158,11 @@
       Functional testing for a FIPS enabled Centos 8 system
     vars:
       enable_fips: True
+      # NOTE(ykarel) Remove MYSQL_GATHER_PERFORMANCE and
+      # tox_environment when this job switches to centos-9-stream
+      MYSQL_GATHER_PERFORMANCE: false
+      tox_environment:
+        TOX_PYTHON: python3.8
       devstack_localrc:
         ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
         Q_BUILD_OVS_FROM_GIT: true