Stop overriding tempest_conf.yaml in CNTT

It's useless as they are skipped by regexes (vnc_console).

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

diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile
index f92ad25..4c41ada 100644 (file)
--- a/docker/smoke-cntt/Dockerfile
+++ b/docker/smoke-cntt/Dockerfile
@@ -1,5 +1,4 @@
 FROM opnfv/functest-smoke:kali
 
 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
deleted file mode 100644 (file)
index 2daf696..0000000
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-compute:
-    max_microversion: 2.87
-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: false
-    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.36
-volume:
-    max_microversion: "3.60"
-    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_noop: true
-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