Simplify project conf files

1. use copy commands instead of pre_copy
2. remove redundant items in project conf files
3. make the volume mapping clearer

Change-Id: I6c6aa58fac65d7e40105e0a54f6544ee5c47db31
Signed-off-by: xudan <xudan16@huawei.com>

27 files changed, 67 insertions, 109 deletions

diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index 5866aa3a..266fb2b6 100644
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -12,6 +12,7 @@
 {% endif %}
 {% set openrc_file = '/tmp/admin_rc.sh' %}
 {% set result_dir = '/home/opnfv/bottlenecks/results' %}
+{% set images_dir = '/home/opnfv/images' %}
 {% set config_dir = '/home/opnfv/userconfig' %}
 {% set image_file = '/tmp/yardstick.img' %}
 
@@ -27,12 +28,10 @@ bottlenecks:
     - '-v {{dovetail_home}}/results/bottlenecks:/tmp'
     - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}'
     - {{cacert_volume}}
-    - '-v {{dovetail_home}}:{{config_dir}}'
+    - '-v {{dovetail_home}}/images:{{images_dir}}'
     - '-v {{dovetail_home}}/results:{{result_dir}}'
-  config:
-    dir: {{config_dir}}
   pre_condition:
-    - 'cp {{config_dir}}/images/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}'
+    - 'cp {{images_dir}}/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}'
   cmds:
     - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} False'
   post_condition:
@@ -40,8 +39,6 @@ bottlenecks:
     - 'cp /tmp/bottlenecks.log {{result_dir}}'
     - 'cp /tmp/bottlenecks.stress.ping.out {{result_dir}}'
     - 'rm {{image_file}}'
-  result:
-    dir: {{result_dir}}
   openrc: {{openrc_file}}
   extra_container:
     - 'Bottlenecks-Yardstick'
diff --git a/etc/conf/functest-k8s_config.yml b/etc/conf/functest-k8s_config.yml
index e717ef94..927af1d7 100644
--- a/etc/conf/functest-k8s_config.yml
+++ b/etc/conf/functest-k8s_config.yml
@@ -26,6 +26,4 @@ functest-k8s:
     - 'run_tests -t {{validate_testcase}} -r'
   post_condition:
     - 'echo test for postcondition in functest'
-  result:
-    dir: {{result_dir}}
   openrc: {{openrc_file}}
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index 451b1675..a7b00e60 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -17,7 +17,8 @@
 {% endif %}
 {% set openrc_file = '/home/opnfv/functest/conf/env_file' %}
 {% set result_dir = '/home/opnfv/functest/results' %}
-{% set config_dir = '/home/opnfv/userconfig' %}
+{% set userconfig_dir = '/home/opnfv/userconfig' %}
+{% set patches_dir = '/home/opnfv/patches' %}
 {% set images_dir = '/home/opnfv/functest/images' %}
 
 functest:
@@ -30,17 +31,16 @@ functest:
   volumes:
     - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}'
     - {{cacert_volume}}
-    - '-v {{dovetail_home}}:{{config_dir}}'
+    - '-v {{dovetail_home}}/pre_config:/home/opnfv/pre_config'
+    - '-v {{dovetail_home}}/userconfig:{{userconfig_dir}}'
+    - '-v {{dovetail_home}}/patches:{{patches_dir}}'
     - '-v {{dovetail_home}}/results:{{result_dir}}'
     - '-v {{dovetail_home}}/images:{{images_dir}}'
-  config:
-    dir: {{config_dir}}
+  patches_dir: {{patches_dir}}
   pre_condition:
     - 'echo test for precondition in functest'
   cmds:
     - 'run_tests -t {{validate_testcase}} -r'
   post_condition:
     - 'echo test for postcondition in functest'
-  result:
-    dir: {{result_dir}}
   openrc: {{openrc_file}}
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index 764ca94b..8f3db551 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -17,8 +17,8 @@
     {% set cacert_volume = ' -v ' + cacert + ':' + cacert %}
 {% endif %}
 {% set openrc_file = '/etc/yardstick/openstack.creds' %}
+{% set pod_file = '/etc/yardstick/pod.yaml' %}
 {% set result_dir = '/tmp/yardstick' %}
-{% set config_dir = '/home/opnfv/userconfig' %}
 
 yardstick:
   image_name: opnfv/yardstick
@@ -29,21 +29,18 @@ yardstick:
   volumes:
     - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}'
     - {{cacert_volume}}
-    - '-v {{dovetail_home}}:{{config_dir}}'
+    - '-v {{dovetail_home}}/pre_config/pod.yaml:{{pod_file}}'
+    - '-v {{dovetail_home}}/images:/home/opnfv/images'
     - '-v {{dovetail_home}}/results:{{result_dir}}'
-  config:
-    dir: {{config_dir}}
   pre_condition:
     - 'echo this is pre_condition'
   cmds:
     - "cd /home/opnfv/repos/yardstick && source {{openrc_file}} &&
          yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
          --output-file {{result_dir}}/{{testcase}}.out
-         --task-args '{'file': '{{config_dir}}/pre_config/pod.yaml',
+         --task-args '{'file': '{{pod_file}}',
                        'attack_host': {{attack_host}},
                        'attack_process': {{attack_process}}}'"
   post_condition:
     - 'echo this is post_condition'
-  result:
-    dir: {{result_dir}}
   openrc: {{openrc_file}}
diff --git a/etc/testcase/functest.bgpvpn.router_association.yml b/etc/testcase/functest.bgpvpn.router_association.yml
index 0922fb01..f6c56ffa 100644
--- a/etc/testcase/functest.bgpvpn.router_association.yml
+++ b/etc/testcase/functest.bgpvpn.router_association.yml
@@ -6,11 +6,9 @@ functest.bgpvpn.router_association:
     type: functest
     testcase: bgpvpn
     image_name: opnfv/functest-features
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase4.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase4.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml
index d27400fb..b1c6cb4d 100644
--- a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml
+++ b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml
@@ -6,11 +6,9 @@ functest.bgpvpn.router_association_floating_ip:
     type: functest
     testcase: bgpvpn
     image_name: opnfv/functest-features
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase8.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase8.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml
index 7260ccd8..bb48663e 100644
--- a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml
+++ b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml
@@ -6,11 +6,9 @@ functest.bgpvpn.subnet_connectivity:
     type: functest
     testcase: bgpvpn
     image_name: opnfv/functest-features
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase1.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase1.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.bgpvpn.tenant_separation.yml b/etc/testcase/functest.bgpvpn.tenant_separation.yml
index efc34fb8..61e768d7 100644
--- a/etc/testcase/functest.bgpvpn.tenant_separation.yml
+++ b/etc/testcase/functest.bgpvpn.tenant_separation.yml
@@ -6,11 +6,9 @@ functest.bgpvpn.tenant_separation:
     type: functest
     testcase: bgpvpn
     image_name: opnfv/functest-features
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase2.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase2.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.security.patrole.yml b/etc/testcase/functest.security.patrole.yml
index db1d9e4b..f1234fa6 100644
--- a/etc/testcase/functest.security.patrole.yml
+++ b/etc/testcase/functest.security.patrole.yml
@@ -6,7 +6,7 @@ functest.security.patrole:
     type: functest
     testcase: patrole
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.security.patrole_vxlan_dependent.yml b/etc/testcase/functest.security.patrole_vxlan_dependent.yml
index f5afa3b4..fd65321e 100644
--- a/etc/testcase/functest.security.patrole_vxlan_dependent.yml
+++ b/etc/testcase/functest.security.patrole_vxlan_dependent.yml
@@ -6,11 +6,9 @@ functest.security.patrole_vxlan_dependent:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.bgpvpn.yml b/etc/testcase/functest.tempest.bgpvpn.yml
index bcac7541..9bf08b11 100644
--- a/etc/testcase/functest.tempest.bgpvpn.yml
+++ b/etc/testcase/functest.tempest.bgpvpn.yml
@@ -7,11 +7,9 @@ functest.tempest.bgpvpn:
     testcase: tempest_custom
     image_name: opnfv/functest-features
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.compute.yml b/etc/testcase/functest.tempest.compute.yml
index 36b4d569..ad71ccc3 100644
--- a/etc/testcase/functest.tempest.compute.yml
+++ b/etc/testcase/functest.tempest.compute.yml
@@ -6,11 +6,9 @@ functest.tempest.compute:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.identity_v3.yml b/etc/testcase/functest.tempest.identity_v3.yml
index 7e64ce19..b53714d6 100644
--- a/etc/testcase/functest.tempest.identity_v3.yml
+++ b/etc/testcase/functest.tempest.identity_v3.yml
@@ -6,11 +6,9 @@ functest.tempest.identity_v3:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.image.yml b/etc/testcase/functest.tempest.image.yml
index d81aa58d..dbfab21b 100644
--- a/etc/testcase/functest.tempest.image.yml
+++ b/etc/testcase/functest.tempest.image.yml
@@ -6,11 +6,9 @@ functest.tempest.image:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.ipv6_api.yml b/etc/testcase/functest.tempest.ipv6_api.yml
index 38a5c8d7..72ffca18 100644
--- a/etc/testcase/functest.tempest.ipv6_api.yml
+++ b/etc/testcase/functest.tempest.ipv6_api.yml
@@ -6,11 +6,9 @@ functest.tempest.ipv6_api:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.ipv6_scenario.yml b/etc/testcase/functest.tempest.ipv6_scenario.yml
index 2378f5e7..4493329b 100644
--- a/etc/testcase/functest.tempest.ipv6_scenario.yml
+++ b/etc/testcase/functest.tempest.ipv6_scenario.yml
@@ -6,11 +6,9 @@ functest.tempest.ipv6_scenario:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.multi_node_scheduling.yml b/etc/testcase/functest.tempest.multi_node_scheduling.yml
index 3f14294a..976c75fc 100644
--- a/etc/testcase/functest.tempest.multi_node_scheduling.yml
+++ b/etc/testcase/functest.tempest.multi_node_scheduling.yml
@@ -6,11 +6,9 @@ functest.tempest.multi_node_scheduling:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.network_api.yml b/etc/testcase/functest.tempest.network_api.yml
index 8d2f53ba..835b87bf 100644
--- a/etc/testcase/functest.tempest.network_api.yml
+++ b/etc/testcase/functest.tempest.network_api.yml
@@ -6,11 +6,9 @@ functest.tempest.network_api:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.network_scenario.yml b/etc/testcase/functest.tempest.network_scenario.yml
index 24511b1d..e9dc0819 100644
--- a/etc/testcase/functest.tempest.network_scenario.yml
+++ b/etc/testcase/functest.tempest.network_scenario.yml
@@ -6,11 +6,9 @@ functest.tempest.network_scenario:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.network_security.yml b/etc/testcase/functest.tempest.network_security.yml
index f2a7f75f..755e7e25 100644
--- a/etc/testcase/functest.tempest.network_security.yml
+++ b/etc/testcase/functest.tempest.network_security.yml
@@ -6,11 +6,9 @@ functest.tempest.network_security:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.osinterop.yml b/etc/testcase/functest.tempest.osinterop.yml
index 124ad419..e0a49fc9 100644
--- a/etc/testcase/functest.tempest.osinterop.yml
+++ b/etc/testcase/functest.tempest.osinterop.yml
@@ -9,7 +9,7 @@ functest.tempest.osinterop:
     type: functest
     testcase: refstack_defcore
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.trunk-ports.yml b/etc/testcase/functest.tempest.trunk-ports.yml
index 1b064b2b..a9f5f1fc 100644
--- a/etc/testcase/functest.tempest.trunk-ports.yml
+++ b/etc/testcase/functest.tempest.trunk-ports.yml
@@ -6,7 +6,7 @@ functest.tempest.neutron_trunk_ports:
     type: functest
     testcase: neutron_trunk
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.vm_lifecycle.yml b/etc/testcase/functest.tempest.vm_lifecycle.yml
index 4bf7b326..f4683305 100644
--- a/etc/testcase/functest.tempest.vm_lifecycle.yml
+++ b/etc/testcase/functest.tempest.vm_lifecycle.yml
@@ -6,11 +6,9 @@ functest.tempest.vm_lifecycle:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.tempest.volume.yml b/etc/testcase/functest.tempest.volume.yml
index 62e33956..98be96ee 100644
--- a/etc/testcase/functest.tempest.volume.yml
+++ b/etc/testcase/functest.tempest.volume.yml
@@ -6,11 +6,9 @@ functest.tempest.volume:
     type: functest
     testcase: tempest_custom
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+      - 'cp /home/opnfv/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/tempest_custom_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/functest/results/tempest_custom.txt /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.vnf.vepc.yml b/etc/testcase/functest.vnf.vepc.yml
index 63a48358..7c75f0a2 100644
--- a/etc/testcase/functest.vnf.vepc.yml
+++ b/etc/testcase/functest.vnf.vepc.yml
@@ -7,7 +7,7 @@ functest.vnf.vepc:
     testcase: juju_epc
     image_name: opnfv/functest-vnf
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/functest.vnf.vims.yml b/etc/testcase/functest.vnf.vims.yml
index 8217972c..cc9b2a87 100644
--- a/etc/testcase/functest.vnf.vims.yml
+++ b/etc/testcase/functest.vnf.vims.yml
@@ -7,7 +7,7 @@ functest.vnf.vims:
     testcase: cloudify_ims
     image_name: opnfv/functest-vnf
     pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
     source_archive_files:
       - functest.log
diff --git a/etc/testcase/yardstick.ha.neutron_l3_agent.yml b/etc/testcase/yardstick.ha.neutron_l3_agent.yml
index 1fb2326d..cf8453e4 100644
--- a/etc/testcase/yardstick.ha.neutron_l3_agent.yml
+++ b/etc/testcase/yardstick.ha.neutron_l3_agent.yml
@@ -9,13 +9,13 @@ yardstick.ha.neutron_l3_agent:
       - 'source /etc/yardstick/openstack.creds &&
          openstack --insecure image create neutron-l3-agent_ha_image
            --disk-format qcow2 --container-format bare --public
-           --file /home/opnfv/userconfig/images/cirros-0.4.0-x86_64-disk.img &&
+           --file /home/opnfv/images/cirros-0.4.0-x86_64-disk.img &&
          openstack --insecure flavor create --ram 512 --vcpu 1 --disk 1 neutron-l3-agent_ha_flavor'
     cmds:
       - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds &&
          yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
          --output-file /tmp/yardstick/{{testcase}}.out
-         --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml',
+         --task-args '{'file': '/etc/yardstick/pod.yaml',
          'image': 'neutron-l3-agent_ha_image', 'flavor': 'neutron-l3-agent_ha_flavor'}'"
     post_condition:
       - 'source /etc/yardstick/openstack.creds &&