diff options
| author |   xudan <xudan16@huawei.com> | 2019-04-10 05:27:26 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2019-04-26 04:04:17 -0400 |
| commit | 8b646e9d3cf696db803c937fe014b8a06c68842d (patch) | |
| tree | 60c0ea23063a3dc5a52fbfb81d668b68a7ef5ec3 /etc | |
| parent | 73febf900b85dae4d953389696f3a78cf8267816 (diff) | |
Change HEAT package from .tag.gz to be .zip
As Trevor Lovett suggests, the Heat file is a zip file. So users need to package
it different only for Dovetail testing.
It will be better to change it to be .zip to keep it the same as what they do.
JIRA: DOVETAIL-770
Change-Id: I5338720c5e1363081e1f8cdce33391a969f1cd97
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/conf/onap-vvp_config.yml | 4 | ||||
| -rw-r--r-- | etc/userconfig/env_config.sh.onap.sample | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/etc/conf/onap-vvp_config.yml b/etc/conf/onap-vvp_config.yml index d812e1f4..3333caed 100644 --- a/etc/conf/onap-vvp_config.yml +++ b/etc/conf/onap-vvp_config.yml @@ -13,10 +13,10 @@ onap-vvp: entrypoint: '' shell: '/bin/ash' volumes: - - '{{dovetail_home}}/pre_config/{{heat_templates_archive}}.tar.gz:/tmp/{{heat_templates_archive}}.tar.gz' + - '{{dovetail_home}}/pre_config/{{heat_templates_archive}}.zip:/tmp/{{heat_templates_archive}}.zip' - '{{dovetail_home}}/results:{{result_dir}}' pre_condition: - - 'tar xf /tmp/{{heat_templates_archive}}.tar.gz -C /vvp' + - 'unzip -o -d /vvp/{{heat_templates_archive}} /tmp/{{heat_templates_archive}}.zip' cmds: - 'pytest tests --template-directory=/vvp/{{heat_templates_archive}} --output-directory={{result_dir}} --report-format=json --continue-on-failure' post_condition: diff --git a/etc/userconfig/env_config.sh.onap.sample b/etc/userconfig/env_config.sh.onap.sample index 4f173a62..7644f0de 100644 --- a/etc/userconfig/env_config.sh.onap.sample +++ b/etc/userconfig/env_config.sh.onap.sample @@ -3,10 +3,11 @@ # The url under which the VNF SDK container is accessible through the host. export HOST_URL="http://<docker host ip>:8702" -# Absolute path of CSAR file, and should be copied to vtp container. +# Absolute path of the CSAR file in container 'refrepo'. export CSAR_FILE="/opt/test.csar" ## Special environment parameters for Heat validation tests. -# The VNF archive should be put at $DOVETAIL_HOME/pre_config. +# The VNF archive should be zip file and put at $DOVETAIL_HOME/pre_config. +# Here should give the name without postfix .zip. export VNF_ARCHIVE_NAME="vnf_archive_name" |