diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/conf/onap-vvp_config.yml | 10 | ||||
| -rw-r--r-- | etc/userconfig/env_config.sh.onap.sample | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/etc/conf/onap-vvp_config.yml b/etc/conf/onap-vvp_config.yml index a7d08ea8..67d21fae 100644 --- a/etc/conf/onap-vvp_config.yml +++ b/etc/conf/onap-vvp_config.yml @@ -1,8 +1,8 @@ --- {% set build_tag = build_tag or '' %} -{% set heat_templates_dir = heat_templates_dir or '' %} -{% set result_dir = '/reports' %} +{% set heat_templates_archive = heat_templates_archive or '' %} +{% set result_dir = '/vvp/reports' %} onap-vvp: image_name: nexus3.onap.org:10001/onap/vvp/validation-scripts @@ -10,11 +10,11 @@ onap-vvp: opts: '-td --entrypoint=""' shell: '/bin/ash' volumes: - - '-v {{heat_templates_dir}}:/template' + - '-v {{dovetail_home}}/pre_config/{{heat_templates_archive}}.tar.gz:/tmp/{{heat_templates_archive}}.tar.gz' - '-v {{dovetail_home}}/results:{{result_dir}}' pre_condition: - - 'echo this is pre_condition' + - 'tar xf /tmp/{{heat_templates_archive}}.tar.gz -C /vvp' cmds: - - 'pytest --template-directory=/template --output-directory=/reports --report-format=json --continue-on-failure' + - 'pytest tests --template-directory=/vvp/{{heat_templates_archive}} --output-directory={{result_dir}} --report-format=json --continue-on-failure' post_condition: - 'echo this is post_condition' diff --git a/etc/userconfig/env_config.sh.onap.sample b/etc/userconfig/env_config.sh.onap.sample index 5f7a2e61..4f173a62 100644 --- a/etc/userconfig/env_config.sh.onap.sample +++ b/etc/userconfig/env_config.sh.onap.sample @@ -8,5 +8,5 @@ export CSAR_FILE="/opt/test.csar" ## Special environment parameters for Heat validation tests. -# The VNF directory should be put at $DOVETAIL_HOME/pre_config. -export VNF_DIRECTORY="/path/to/pre_config/vnf_dir" +# The VNF archive should be put at $DOVETAIL_HOME/pre_config. +export VNF_ARCHIVE_NAME="vnf_archive_name" |