From 7f5fb86232a92008e3f9c3be8a00287a1cd09b20 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Wed, 25 May 2022 14:42:00 +0530 Subject: [PATCH] Switch Fips fullstack/functional tests to py3.8 Master has dropped py3.6 support so upper-constraints requirements are not installable with python3.6 and due to this fips jobs which are running on py3.6 are failing. Let's run the functional/fullstack tests with python3.8 on CentOS 8-Stream itself. Also disable dbcounter installation as it's not installing on python3.6. The hacks can be cleaned up when these jobs are switched to CentOS 9-Stream, currently have some issues as mentioned in the Related Bug. Depends-On: https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/843989 Related-Bug: #1976323 Change-Id: I757dbf929cb1dc27027614bbb2147a61606f85a9 --- roles/configure_functional_tests/tasks/main.yaml | 4 ++++ tox.ini | 2 +- zuul.d/base.yaml | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/roles/configure_functional_tests/tasks/main.yaml b/roles/configure_functional_tests/tasks/main.yaml index fe629620fb9..6f7f798d619 100644 --- a/roles/configure_functional_tests/tasks/main.yaml +++ b/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 diff --git a/tox.ini b/tox.ini index 5fa04d79289..1a7612479d3 100644 --- a/tox.ini +++ b/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} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 925b453bf63..b38322f49dd 100644 --- a/zuul.d/base.yaml +++ b/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