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>

4 files changed, 13 insertions, 21 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}}