From: shangxdy Date: Wed, 3 Jan 2018 06:32:58 +0000 (+0800) Subject: Replace relative path with absolute path for functest script X-Git-Tag: opnfv-6.0.0~8^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F49907%2F1;p=parser.git Replace relative path with absolute path for functest script urrent parser script for functest is supposed that functest enterns the tests directory of parser firstly, and then call functest_parser.sh; it need to use absolute path instead of relative path as work directory. This modification is from functest patch: https://gerrit.opnfv.org/gerrit/#/c/49649/ JIRA: PARSER-171 Change-Id: I55b3ce882e6ddd48edf9f43eb8fae8334c5458aa Signed-off-by: shangxdy --- diff --git a/tests/functest_run.sh b/tests/functest_run.sh index d8aab32..bdbe898 100755 --- a/tests/functest_run.sh +++ b/tests/functest_run.sh @@ -49,10 +49,10 @@ PARSER_ROLE=admin PARSER_STACK_NAME=vRNC_Stack -# VRNC_INPUT_TEMPLATE_FILE=../tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml -# VRNC_INPUT_TEMPLATE_RAW_FILE=../tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml -VRNC_INPUT_TEMPLATE_RAW_FILE=../tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/vRNC.yaml -VRNC_OUTPUT_TEMPLATE_FILE=../tosca2heat/heat-translator/translator/tests/data/vRNC/vRNC_Hot_Template.yaml +# VRNC_INPUT_TEMPLATE_FILE=${PRASER_WORK_DIR}/../tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml +# VRNC_INPUT_TEMPLATE_RAW_FILE=${PRASER_WORK_DIR}/../tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml +VRNC_INPUT_TEMPLATE_RAW_FILE=${PRASER_WORK_DIR}/../tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/vRNC.yaml +VRNC_OUTPUT_TEMPLATE_FILE=${PRASER_WORK_DIR}/../tosca2heat/heat-translator/translator/tests/data/vRNC/vRNC_Hot_Template.yaml VRNC_INPUT_TEMPLATE_FILE=${VRNC_INPUT_TEMPLATE_RAW_FILE%.*}_patch.yaml