diff --git a/roles/configure_functional_tests/tasks/main.yaml b/roles/configure_functional_tests/tasks/main.yaml index aa887114824..feb44c37244 100644 --- a/roles/configure_functional_tests/tasks/main.yaml +++ b/roles/configure_functional_tests/tasks/main.yaml @@ -25,6 +25,7 @@ # This is DB USER used in mysql db DATABASE_USER=openstack_citest MYSQL_GATHER_PERFORMANCE={{ MYSQL_GATHER_PERFORMANCE | default(true) }} + PYTHON3_VERSION={{ PYTHON3_VERSION | default('3') }} source $NEUTRON_DIR/tools/configure_for_func_testing.sh if is_fedora; then diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 59a13850899..73ce057352e 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -150,6 +150,10 @@ vars: nslookup_target: 'opendev.org' enable_fips: True + # NOTE(ykarel) remove python3 override with 10-stream switch + PYTHON3_VERSION: 3.12 + tox_environment: + TOX_PYTHON: python3.12 devstack_localrc: ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256 Q_BUILD_OVS_FROM_GIT: true @@ -235,6 +239,10 @@ vars: nslookup_target: 'opendev.org' enable_fips: True + # NOTE(ykarel) remove python3 override with 10-stream switch + PYTHON3_VERSION: 3.12 + tox_environment: + TOX_PYTHON: python3.12 devstack_localrc: ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256 Q_BUILD_OVS_FROM_GIT: true diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index d2da0711a29..02a3ac0a938 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -702,6 +702,9 @@ parent: neutron-ovn-tempest-ovs-master nodeset: devstack-single-node-centos-9-stream vars: + devstack_localrc: + # NOTE(ykarel) remove python3 override with 10-stream switch + PYTHON3_VERSION: 3.12 zuul_copy_output: '{{ devstack_base_dir }}/data/ovs': 'logs' '{{ devstack_base_dir }}/data/ovn': 'logs' @@ -721,6 +724,9 @@ devstack_services: br-ex-tcpdump: true br-int-flows: true + devstack_localrc: + # NOTE(ykarel) remove python3 override with 10-stream switch + PYTHON3_VERSION: 3.12 devstack_local_conf: test-config: "$TEMPEST_CONFIG": @@ -737,6 +743,9 @@ vars: nslookup_target: 'opendev.org' configure_swap_size: 4096 + devstack_localrc: + # NOTE(ykarel) remove python3 override with 10-stream switch + PYTHON3_VERSION: 3.12 devstack_local_conf: test-config: "$TEMPEST_CONFIG":