Prevent microversion conflicts

CNTT selects Pike as baseline and Hunter matches Rocky.

Change-Id: I8a1aa8385adce1ebb9d74bcb897effaf5b434e5a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 82ceefd8f1609508a476aa2e4573e59926653165)

3 files changed, 98 insertions, 1 deletions

diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile
index 8dd75f159..c6b097093 100644
--- a/docker/smoke-cntt/Dockerfile
+++ b/docker/smoke-cntt/Dockerfile
@@ -1,4 +1,5 @@
 FROM opnfv/functest-smoke
 
 COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
+COPY tempest_conf.yaml /usr/lib/python3.8/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
 CMD ["run_tests", "-t", "all"]
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
new file mode 100644
index 000000000..a1bc23284
--- /dev/null
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -0,0 +1,91 @@
+---
+compute:
+    max_microversion: 2.53
+compute-feature-enabled:
+    attach_encrypted_volume: false
+    block_migration_for_live_migration: false
+    block_migrate_cinder_iscsi: false
+    change_password: false
+    cold_migration: true
+    config_drive: true
+    console_output: true
+    disk_config: true
+    enable_instance_password: true
+    interface_attach: true
+    live_migration: true
+    live_migrate_back_and_forth: false
+    metadata_service: true
+    pause: true
+    personality: false
+    rdp_console: false
+    rescue: true
+    resize: true
+    scheduler_available_filters: "AvailabilityZoneFilter,ComputeFilter,\
+      ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,\
+      ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter"
+    serial_console: false
+    shelve: true
+    snapshot: true
+    spice_console: false
+    suspend: true
+    swap_volume: false
+    vnc_console: true
+    volume_backed_live_migration: false
+    volume_multiattach: false
+identity:
+    auth_version: v3
+    user_unique_last_password_count: 2
+    user_lockout_duration: 10
+    user_lockout_failure_attempts: 2
+identity-feature-enabled:
+    trust: true
+    api_v2: false
+    api_v2_admin: false
+    security_compliance: true
+    federation: false
+    external_idp: false
+    project_tags: true
+    application_credentials: true
+image-feature-enabled:
+    api_v2: true
+    api_v1: false
+network-feature-enabled:
+    port_admin_state_change: true
+    port_security: true
+    floating_ips: true
+placement:
+    max_microversion: "1.10"
+volume:
+    max_microversion: 3.43
+    storage_protocol: ceph
+    manage_volume_ref: source-name,volume-%s
+    manage_snapshot_ref: source-name,snapshot-%s
+volume-feature-enabled:
+    multi_backend: false
+    backup: true
+    snapshot: true
+    clone: true
+    manage_snapshot: true
+    manage_volume: true
+    extend_attached_volume: false
+    consistency_group: false
+    volume_revert: true
+load_balancer:
+    test_with_ipv6: false
+neutron_plugin_options:
+    agent_availability_zone: nova
+    available_type_drivers: flat,geneve,vlan,gre,local,vxlan
+    provider_vlans: foo,
+    create_shared_resources: true
+object-storage-feature-enabled:
+    discoverable_apis: "account_quotas,formpost,bulk_upload,bulk_delete,\
+      tempurl,crossdomain,container_quotas,staticweb,account_quotas,slo"
+    object_versioning: true
+    discoverability: true
+heat_plugin:
+    skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
+      VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest,\
+      LoadBalancerTest"
+    auth_version: 3
+heat_features_enabled:
+    multi_cloud: false
diff --git a/docker/smoke-cntt/testcases.yaml b/docker/smoke-cntt/testcases.yaml
index 0e0220bf1..01c38feaa 100644
--- a/docker/smoke-cntt/testcases.yaml
+++ b/docker/smoke-cntt/testcases.yaml
@@ -165,7 +165,7 @@ tiers:
                 criteria: 100
                 blocking: false
                 deny_skipping: true
-                tests_count: 1283
+                tests_count: 1278
                 description: >-
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
@@ -177,15 +177,20 @@ tiers:
                         mode: "(?!.*test_fixed_ips)\
                           (?!.*test_fixed_ips_negative)\
                           (?!.*test_auto_allocate_network)(?!.*test_floating_ips_bulk)\
+                          (?!.*test_flavors_microversions.FlavorsV255TestJSON)\
+                          (?!.*test_flavors_microversions.FlavorsV261TestJSON)\
                           (?!.*test_live_migration.LiveAutoBlockMigrationV225Test.test_iscsi_volume)\
                           (?!.*test_live_migration.LiveAutoBlockMigrationV225Test.test_volume_backed_live_migration)\
                           (?!.*test_live_migration.LiveMigrationTest.test_iscsi_volume)\
                           (?!.*test_live_migration.LiveMigrationTest.test_volume_backed_live_migration)\
                           (?!.*test_live_migration.LiveMigrationRemoteConsolesV26Test)\
+                          (?!.*test_quotas.QuotasAdminTestV257)\
                           (?!.*certificates.test_certificates)\
                           (?!.*test_quotas_negative.QuotasSecurityGroupAdminNegativeTest)\
                           (?!.*test_novnc)(?!.*test_server_personality)\
                           (?!.*test_servers.ServerShowV263Test.test_show_update_rebuild_list_server)\
+                          (?!.*test_servers_microversions.ServerShowV254Test)\
+                          (?!.*test_servers_microversions.ServerShowV257Test)\
                           (?!.*test_servers_negative.ServersNegativeTestJSON.test_personality_file_contents_not_encoded)\
                           (?!.*servers.test_virtual_interfaces)\
                           (?!.*test_server_actions.ServerActionsTestJSON.test_change_server_password)\