diff options
Diffstat (limited to 'functest')
3 files changed, 9 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml index ca1165575..476c0f2e4 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -1,6 +1,6 @@ --- compute: - max_microversion: latest + max_microversion: '2.90' compute-feature-enabled: attach_encrypted_volume: false block_migration_for_live_migration: false @@ -55,14 +55,14 @@ network-feature-enabled: port_admin_state_change: true port_security: true placement: - max_microversion: latest + max_microversion: 1.38 validation: image_ssh_user: cirros ssh_timeout: 196 ip_version_for_ssh: 4 run_validation: true volume: - max_microversion: latest + max_microversion: 3.66 storage_protocol: ceph manage_volume_ref: source-name,volume-%s manage_snapshot_ref: source-name,snapshot-%s diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml index ab82b87b1..8bb0e7ffb 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml @@ -1,6 +1,6 @@ --- compute: - max_microversion: latest + max_microversion: '2.90' compute-feature-enabled: attach_encrypted_volume: false block_migration_for_live_migration: false @@ -55,14 +55,14 @@ network-feature-enabled: port_admin_state_change: true port_security: true placement: - max_microversion: latest + max_microversion: 1.38 validation: image_ssh_user: cirros ssh_timeout: 196 ip_version_for_ssh: 4 run_validation: true volume: - max_microversion: latest + max_microversion: 3.66 storage_protocol: ceph manage_volume_ref: source-name,volume-%s manage_snapshot_ref: source-name,snapshot-%s diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index 31e453504..b384950e0 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -112,8 +112,10 @@ def get_openstack_version(cloud): version = get_nova_version(cloud) try: assert version - if version > (2, 88): + if version > (2, 90): osversion = "Master" + elif version > (2, 88): + osversion = "Xena" elif version > (2, 87): osversion = "Wallaby" elif version > (2, 79): |