18 files changed, 28 insertions, 36 deletions

diff --git a/etc/testcase/sdnvpn.router_association.yml b/etc/testcase/sdnvpn.router_association.yml
index f52446fe..f20669cd 100644
--- a/etc/testcase/sdnvpn.router_association.yml
+++ b/etc/testcase/sdnvpn.router_association.yml
@@ -12,9 +12,7 @@ dovetail.sdnvpn.router_association:
   report:
     source_archive_files:
       - functest.log
-      - bgpvpn.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.router_association.functest.log
       - sdnvpn_logs/dovetail.sdnvpn.router_association.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.router_association_floating_ip.yml b/etc/testcase/sdnvpn.router_association_floating_ip.yml
index bdcc38d9..1c4fc59d 100644
--- a/etc/testcase/sdnvpn.router_association_floating_ip.yml
+++ b/etc/testcase/sdnvpn.router_association_floating_ip.yml
@@ -12,9 +12,7 @@ dovetail.sdnvpn.router_association_floating_ip:
   report:
     source_archive_files:
       - functest.log
-      - bgpvpn.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.router_association_floating_ip.functest.log
       - sdnvpn_logs/dovetail.sdnvpn.router_association_floating_ip.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.subnet_connectivity.yml b/etc/testcase/sdnvpn.subnet_connectivity.yml
index dcecd78f..05a098f7 100644
--- a/etc/testcase/sdnvpn.subnet_connectivity.yml
+++ b/etc/testcase/sdnvpn.subnet_connectivity.yml
@@ -12,9 +12,7 @@ dovetail.sdnvpn.subnet_connectivity:
   report:
     source_archive_files:
       - functest.log
-      - bgpvpn.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.subnet_connectivity.functest.log
       - sdnvpn_logs/dovetail.sdnvpn.subnet_connectivity.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.tenant_separation.yml b/etc/testcase/sdnvpn.tenant_separation.yml
index bf0459c6..e99620ac 100644
--- a/etc/testcase/sdnvpn.tenant_separation.yml
+++ b/etc/testcase/sdnvpn.tenant_separation.yml
@@ -12,9 +12,7 @@ dovetail.sdnvpn.tenant_separation:
   report:
     source_archive_files:
       - functest.log
-      - bgpvpn.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.tenant_separation.functest.log
       - sdnvpn_logs/dovetail.sdnvpn.tenant_separation.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/tempest.bgpvpn.yml b/etc/testcase/tempest.bgpvpn.yml
index 6644616b..df64dc40 100644
--- a/etc/testcase/tempest.bgpvpn.yml
+++ b/etc/testcase/tempest.bgpvpn.yml
@@ -15,8 +15,8 @@ dovetail.tempest.bgpvpn:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.bgpvpn.functest.log
       - tempest_logs/dovetail.tempest.bgpvpn.log
diff --git a/etc/testcase/tempest.compute.yml b/etc/testcase/tempest.compute.yml
index d7a06d1b..7e126bea 100644
--- a/etc/testcase/tempest.compute.yml
+++ b/etc/testcase/tempest.compute.yml
@@ -14,8 +14,8 @@ dovetail.tempest.compute:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.compute.functest.log
       - tempest_logs/dovetail.tempest.compute.log
diff --git a/etc/testcase/tempest.identity_v2.yml b/etc/testcase/tempest.identity_v2.yml
index 8a9e578d..3cd22aea 100644
--- a/etc/testcase/tempest.identity_v2.yml
+++ b/etc/testcase/tempest.identity_v2.yml
@@ -14,8 +14,8 @@ dovetail.tempest.identity_v2:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.identity_v2.functest.log
       - tempest_logs/dovetail.tempest.identity_v2.log
diff --git a/etc/testcase/tempest.identity_v3.yml b/etc/testcase/tempest.identity_v3.yml
index 2ba46548..bc55f5ab 100644
--- a/etc/testcase/tempest.identity_v3.yml
+++ b/etc/testcase/tempest.identity_v3.yml
@@ -14,8 +14,8 @@ dovetail.tempest.identity_v3:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.identity_v3.functest.log
       - tempest_logs/dovetail.tempest.identity_v3.log
diff --git a/etc/testcase/tempest.image.yml b/etc/testcase/tempest.image.yml
index d2d6fddd..917aedfc 100644
--- a/etc/testcase/tempest.image.yml
+++ b/etc/testcase/tempest.image.yml
@@ -14,8 +14,8 @@ dovetail.tempest.image:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.image.functest.log
       - tempest_logs/dovetail.tempest.image.log
diff --git a/etc/testcase/tempest.ipv6_api.yml b/etc/testcase/tempest.ipv6_api.yml
index b0706fe9..5423f082 100644
--- a/etc/testcase/tempest.ipv6_api.yml
+++ b/etc/testcase/tempest.ipv6_api.yml
@@ -14,8 +14,8 @@ dovetail.tempest.ipv6_api:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.ipv6_api.functest.log
       - tempest_logs/dovetail.tempest.ipv6_api.log
diff --git a/etc/testcase/tempest.ipv6_scenario.yml b/etc/testcase/tempest.ipv6_scenario.yml
index c33b02a5..f35d5236 100644
--- a/etc/testcase/tempest.ipv6_scenario.yml
+++ b/etc/testcase/tempest.ipv6_scenario.yml
@@ -14,8 +14,8 @@ dovetail.tempest.ipv6_scenario:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.ipv6_scenario.functest.log
       - tempest_logs/dovetail.tempest.ipv6_scenario.log
diff --git a/etc/testcase/tempest.multi_node_scheduling.yml b/etc/testcase/tempest.multi_node_scheduling.yml
index 0c77bb79..99224ef5 100644
--- a/etc/testcase/tempest.multi_node_scheduling.yml
+++ b/etc/testcase/tempest.multi_node_scheduling.yml
@@ -14,8 +14,8 @@ dovetail.tempest.multi_node_scheduling:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.multi_node_scheduling.functest.log
       - tempest_logs/dovetail.tempest.multi_node_scheduling.log
diff --git a/etc/testcase/tempest.network_api.yml b/etc/testcase/tempest.network_api.yml
index 159dc1f1..d28a0cbe 100644
--- a/etc/testcase/tempest.network_api.yml
+++ b/etc/testcase/tempest.network_api.yml
@@ -14,8 +14,8 @@ dovetail.tempest.network_api:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.network_api.functest.log
       - tempest_logs/dovetail.tempest.network_api.log
diff --git a/etc/testcase/tempest.network_scenario.yml b/etc/testcase/tempest.network_scenario.yml
index f2b83327..5e1a9609 100644
--- a/etc/testcase/tempest.network_scenario.yml
+++ b/etc/testcase/tempest.network_scenario.yml
@@ -14,8 +14,8 @@ dovetail.tempest.network_scenario:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.network_scenario.functest.log
       - tempest_logs/dovetail.tempest.network_scenario.log
diff --git a/etc/testcase/tempest.network_security.yml b/etc/testcase/tempest.network_security.yml
index dbd33324..dd9e3e7a 100644
--- a/etc/testcase/tempest.network_security.yml
+++ b/etc/testcase/tempest.network_security.yml
@@ -14,8 +14,8 @@ dovetail.tempest.network_security:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.network_security.functest.log
       - tempest_logs/dovetail.tempest.network_security.log
diff --git a/etc/testcase/tempest.osinterop.yml b/etc/testcase/tempest.osinterop.yml
index 828b325b..fe50024c 100644
--- a/etc/testcase/tempest.osinterop.yml
+++ b/etc/testcase/tempest.osinterop.yml
@@ -14,8 +14,8 @@ dovetail.tempest.osinterop:
   report:
     source_archive_files:
       - functest.log
-      - refstack/tempest.log
-      - refstack/tempest-report.html
+      - refstack_defcore/tempest.log
+      - refstack_defcore/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.osinterop.functest.log
       - tempest_logs/dovetail.tempest.osinterop.log
diff --git a/etc/testcase/tempest.vm_lifecycle.yml b/etc/testcase/tempest.vm_lifecycle.yml
index 282c450a..d86f8282 100644
--- a/etc/testcase/tempest.vm_lifecycle.yml
+++ b/etc/testcase/tempest.vm_lifecycle.yml
@@ -14,8 +14,8 @@ dovetail.tempest.vm_lifecycle:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.vm_lifecycle.functest.log
       - tempest_logs/dovetail.tempest.vm_lifecycle.log
diff --git a/etc/testcase/tempest.volume.yml b/etc/testcase/tempest.volume.yml
index 37ffb04c..9b925c18 100644
--- a/etc/testcase/tempest.volume.yml
+++ b/etc/testcase/tempest.volume.yml
@@ -14,8 +14,8 @@ dovetail.tempest.volume:
   report:
     source_archive_files:
       - functest.log
-      - tempest/tempest.log
-      - tempest/tempest-report.html
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.volume.functest.log
       - tempest_logs/dovetail.tempest.volume.log