aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-10-05 20:47:10 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-10-06 15:19:00 +0200
commitd1e701f61605326fb908778f13aa2c25cc915a80 (patch)
tree9a4fb20489299943a73b25eb3d43bec895e6a24b
parent1cc94c2dca9c151839a3e595f5c9faca2e14be86 (diff)
Add Victoria in OpenStack release detection
Change-Id: I0e2b02f6ce5b315da090a5a04ae1c0e40ec114aa Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml6
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml6
-rw-r--r--functest/utils/functest_utils.py2
3 files changed, 7 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 a444a54f5..7bd323690 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.87
compute-feature-enabled:
attach_encrypted_volume: false
block_migration_for_live_migration: false
@@ -54,7 +54,7 @@ network-feature-enabled:
port_security: true
floating_ips: true
placement:
- max_microversion: latest
+ max_microversion: 1.36
validation:
image_ssh_user: cirros
ssh_timeout: 196
@@ -62,7 +62,7 @@ validation:
run_validation: true
connect_method: floating
volume:
- max_microversion: latest
+ max_microversion: 3.62
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 141f295b4..057d74e80 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.87
compute-feature-enabled:
attach_encrypted_volume: false
block_migration_for_live_migration: false
@@ -54,7 +54,7 @@ network-feature-enabled:
port_security: true
floating_ips: true
placement:
- max_microversion: latest
+ max_microversion: 1.36
validation:
image_ssh_user: cirros
ssh_timeout: 196
@@ -62,7 +62,7 @@ validation:
run_validation: true
connect_method: floating
volume:
- max_microversion: latest
+ max_microversion: 3.62
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 c48acd3b9..f2d93a8a4 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -117,7 +117,7 @@ def get_openstack_version(cloud):
if version > (2, 87):
osversion = "Master"
elif version > (2, 79):
- osversion = "Ussuri"
+ osversion = "Ussuri or Victoria"
elif version > (2, 72):
osversion = "Train"
elif version > (2, 65):