summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-03-08Update git submodulesagardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Nothing change to apex job to kick it into working Change-Id: I88f33b7dcdf8f4d0a3aa3f8d46a07f10c62e6ae9 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-03-08Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "fuel: Add functest and yardstick as downstream jobs" - fuel: Add functest and yardstick as downstream jobs Change-Id: I90f42dc36ed0555788b517572088b5f09c1569fb Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-03-08Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - functest: Enable functest daily jobs Change-Id: I1ce9e727a7f1448f657652a0f8d4bbab144b3ab9 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-03-08Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Update Functest jobs (please vote an do not merge)" - Update Functest jobs (please vote an do not merge) We are going to try this again. Once this is merged, I will need to delete all the jobs that change job type and then re-merge releng merge will be broken during this short window. --- original commit message --- Add support for functest tier with multijob Add publishers separate for fetures and all other functest tiers Run functest features suits in a mutijob Since there are no arm specific requirements, remove arm-daily builders and jobs Original patch by Delia Popescu <delia.popescu@enea.com> Change-Id: I43422463c442ff6a18f6a98ab9909fc6c88e0259 JIRA: FUNCTEST-917 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-03-08Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: xci-start-new-vm: Switch to pre-built bifrost OS images" - jjb: xci: xci-start-new-vm: Switch to pre-built bifrost OS images Change-Id: I19e60eea65b01ec22bb32c0efcdc6b071b22ca34 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-03-08Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Run patrole test in Jenkins" - Run patrole test in Jenkins Change-Id: I94fe7ecf83e72b4e7ed47bb25cfe010d9b3db15d Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-03-07Update git submodulesJulien1-0/+0
* Update docs/submodules/releng from branch 'master' - Update return value from postbuildscript PostBuildScript plugin's result affects Jenkins pipeline, so we should return the original job running status in the postbuildscript in the end Update macros: 1. from $POD_NAME to $NODE_NAME 2. from $SCENARIO to $DEPLOY_SCENARIO 2. {installer} to $INSTALLER_TYPE for {installer} is not existed in trigger job 3. add parameters definition for they can not be used in trigger jobs by predefined-parameters 4. missing TIMESTAMP_END Change-Id: I354be3d5ad02e53bb988995adc09b59e92a1640a Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2018-03-07Update git submodulesJulien1-0/+0
* Update docs/submodules/releng from branch 'master' - Update include-raw tag replace `include-raw-escape` with `include-raw` for no jjb macros in the bash file. Change-Id: I6125779f23a5aafd7fed0f5017c4280394624bcd Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2018-03-06Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Bugfix of the wrong regrex for Dovetail Jobs" - Bugfix of the wrong regrex for Dovetail Jobs Change-Id: I5823f763d2f321a0b2505ca3ecd042e928b5a42c Signed-off-by: xudan <xudan16@huawei.com>
2018-03-06Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Build functest-patrole in Functest multijob" - Build functest-patrole in Functest multijob Change-Id: Ic67c3f1556b1e0cf382c640bacb6e3d672564507 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-03-06Update git submodulesxudan1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Bugfix: it crashes when check_tc_result returns None The function 'check_tc_result' may return 'None'. In this case it will throw an exception because of https://github.com/opnfv/dovetail/blob/master/dovetail/run.py#L65 The exception is like Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/dovetail/run.py", line 339, in <module> main() File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 716, in _call_ return self.main(*args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 696, in main rv = self.invoke(ctx) File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 889, in invoke return ctx.invoke(self.callback, **ctx.params) File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 534, in invoke return callback(*args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/dovetail/run.py", line 304, in main duration = run_test(testsuite_yaml, testarea, logger, kwargs) File "/usr/local/lib/python2.7/dist-packages/dovetail/run.py", line 65, in run_test if stop_on_fail['criteria'] == "FAIL" and kwargs['stop']: TypeError: 'NoneType' object has no attribute '_getitem_' JIRA: DOVETAIL-622 Change-Id: I9e612b380c3dfb148692074a3bf8eb31875213ac Signed-off-by: xudan <xudan16@huawei.com>
2018-03-06Update git submodulesSerenaFeng1-0/+0
* Update docs/submodules/dovetail from branch 'master' - simplify file existence check with os.path.isfile() Change-Id: I89d15e18c588c27ab41596119d5288cba6e4e02d Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn> - leverage data_files to eliminate so many hardcoded abs_path_seekings 1. mv conf/ userconfig/ compliance/ patch to etc/ 2. after installation etc/ will be put under /etc/dovetail 3. leveraging /etc/dovetail in coding Change-Id: Icf9cb00ff7fc7cf35755f60d3e258b23e2c70839 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2018-03-06Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "barometer_docker: add barometer-snmp to build" - barometer_docker: add barometer-snmp to build Change-Id: I5dc37a4970df4fc432bc65454872f45466d8749d Signed-off-by: Gordon Kelly <gordon.kelly@intel.com>
2018-03-06Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[fuel, armband] Add os-ovn-nofeature-ha scenario" - [fuel, armband] Add os-ovn-nofeature-ha scenario While at it, cleanup useless ovn/Euphrates jobs, we didn't have OVN in E release of Fuel@OPNFV. JIRA: FUEL-329 Change-Id: I4a9b476c292a05cf0b9cadaa3102ebccf2baa10a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-06Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[compass4nfv] add the docker images build" - [compass4nfv] add the docker images build add two new docker iamges 1. compass-tasks-k8s 2. compass-tasks-osa Change-Id: I31a09e02a251df4a8a94437c664151c4b14e12e3 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-03-06Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "container4nfv: run scenarios on arm baremetal" - container4nfv: run scenarios on arm baremetal Change-Id: I3ee659fafcf37b84f261444844af9c421d6843ca Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-03-05Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[pharos] Run verify job for utils/*.py changes" - [pharos] Run verify job for utils/*.py changes Change-Id: I9ecfb78c715d68bd5dd11f42829c040c9bde6f6b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-05Update git submodulesagardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Allow monit config script to use custom hostname we need to use this script for connecting labs.opnfv.org machines to the sandbox.opnfv.org adds optional -l swtich Change-Id: I620c963841a2ff39a8c08565cb474f7fdb833c74 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-03-05Update git submodulesagardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Add start delay to monit for jnlp daemon delay the first check by 4-minutes This is a better solution thant check process every 2 cycles check process every 2 cycles delays initial startup by 2 cycles delay check gives the script time to spawn, as the wget slave.jar takes some time from china. Change-Id: I8066e5b65efc41aaa67ee0f6ab8ee2c1aa86a67c Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-03-05Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Report the result to TestAPI" - Report the result to TestAPI Report the provision result to TestAPI. Change-Id: I05a3a870125c2b1e74b98da043b53684ea334683 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2018-03-05Update git submodulesGeorg Kunz1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Adding SDNVPN tempest test cases to proposed_tests suite Adding the SDNVPN Tempest API test cases of the SDNVPN project to the proposed_tests suite to allow for running these tests in the CI pipeline for validating their suitability for inclusion in the OVP Euphrates release. JIRA: DOVETAIL-608 Change-Id: Ic12db1584a2540a14979094c65fc128c6020ecea Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2018-03-02Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - jjb: xci: Use core OpenStack installation by default We do not need all the components installed when deploying OpenStack so we can speed up the jobs by removing some of them. Change-Id: I19120915d0ef7c59b8b470c5fb87e9c0aa3e3673 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-03-02Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Cat functest log until the log upload is enabled Change-Id: I883e6e29cf102d1069e3760ab95dd24d76d0a222 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-03-02Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add envs via volume mapping" - Add envs via volume mapping Change-Id: I39bdde31bfc5674eecf1528427b55a7f0335bd89 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-03-02Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Remove Whitespace from CVP Docker README Change-Id: Ic880258ef8ffbcbdcf3452419dd385227567a5a3 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-03-02Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[fuel, armband] Fix broken regex in cond (2)" - [fuel, armband] Fix broken regex in cond (2) Fixes: af7df31 Change-Id: I6369ded12a50a2aa7f0268488c5511fba9732a99 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-02Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "add testapi-client verify job" - add testapi-client verify job Change-Id: I83f57a0967d6b8744a7c4890092fe0596e705291 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2018-03-02Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge changes from topics 'decouple_verify_automate', 'simplify_automate_jjb' * changes: decouple testresults verify job from automate job simplify automate jjb definition using releng_macro - decouple testresults verify job from automate job Change-Id: I45f01dbeb3ed9c1d3efe495f57bcbbfbb0d0b3e2 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn> - simplify automate jjb definition using releng_macro 1. leveraging macro gerrit-trigger-patchset-created 2. leveraging macro gerrit-trigger-change-merged 3. rename automate to testresults-automate Change-Id: I3dfee8dad28db7e818b912fed6d65b60b3f96391 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2018-03-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - [fuel, armband] Fix broken regex in dovetail cond Fixes: af7df31 Change-Id: I13e20591ce82792a12a514ae62e3b3dd4ed50e65 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-01Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Do not fail the job if virsh command fails Change-Id: Ie5fae322f98ec6c9c2236486642c0d71c6a04aae Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-03-01Update git submodulesxudan1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Bugfix: Dovetail tool will crash when hosts.yaml file with incorrect format If the hosts.yaml file is like, — hosts_info: 192.168.141.101: it will raise an exception, File "/usr/local/lib/python2.7/dist-packages/dovetail/utils/dovetail_utils.py", line 227, in add_hosts_info names=hostnames) File "/usr/local/lib/python2.7/dist-packages/python_hosts/hosts.py", line 54, in _init_ raise Exception('Address and Name(s) must be specified.') Exception: Address and Name(s) must be specified. If the hosts.yaml file is empty, it will crash with, File "/usr/local/lib/python2.7/dist-packages/dovetail/container.py", line 174, in create if hosts_yaml['hosts_info']: TypeError: 'NoneType' object has no attribute '_getitem_' JIRA: DOVETAIL-621 Change-Id: I547928e514b3294c048379459c07df89879fbb03 Signed-off-by: xudan <xudan16@huawei.com>
2018-03-01Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add functest-kubernetes project job" - Add functest-kubernetes project job It mainly inherits from functest project jobs. Change-Id: Ibcb8825ee3d98ca816a5036e0a66776e314f2ddb Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-03-01Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Fix scenario name extraction Change-Id: Ifcea3d364b73d0d19d46aaf2bd2210ec6440f383 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-03-01Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Build opnfv/xtesting via functest-xtesting" - Build opnfv/xtesting via functest-xtesting Change-Id: I63d79a2c84221736e08d4bea1a2cf8ac92c023d9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-03-01Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Pull the latest parent when building containers" - Pull the latest parent when building containers Change-Id: I534c14f4415c16661fb95966077621497c6f9cdc Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-03-01Update git submoduleswutianwei1-0/+0
* Update docs/submodules/releng from branch 'master' - [compass4nfv] add nosdn-bar-noha scenario Change-Id: I5a513e143aff0775d066532af14165c4509aa82e Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-03-01Update git submoduleszhihui wu1-0/+0
* Update docs/submodules/releng from branch 'master' - modify qtip job template The parameter 'SUT' is meaningless to storage job and experiment job. Change-Id: I40322962111896773821b8ef2f05e6f330d7da00 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Use distro specific ssh config while sshing to xci vms Change-Id: I9366639570315f879a662ca9e65a1894cd905a92 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Use distro specific ssh config while sshing to xci vms Change-Id: I231488cd9de58a9051bd289c3d584841e7335417 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "xci: Use distro specific ssh config while sshing to xci vms" - xci: Use distro specific ssh config while sshing to xci vms Change-Id: I5e8b738d4293040b2792a926cd13708180590bbb Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-02-28Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/releng from branch 'master' - [Yardstick] add apt-get autoremove to free up disk space yardstick builds are failing due to running out of disk space when too many kernels are left installed. Try apt-get autoremove to cleanup before updating [yardstick-verify-master] $ /bin/bash /tmp/jenkins4572301318127685434.sh Reading package lists... Building dependency tree... Reading state information... build-essential is already the newest version (12.1ubuntu2). python3-dev is already the newest version (3.5.1-3). python-dev is already the newest version (2.7.12-1~16.04). The following packages were automatically installed and are no longer required: linux-headers-4.4.0-101 linux-headers-4.4.0-101-generic linux-headers-4.4.0-103 linux-headers-4.4.0-103-generic linux-headers-4.4.0-104 linux-headers-4.4.0-104-generic linux-headers-4.4.0-108 linux-headers-4.4.0-108-generic linux-headers-4.4.0-109 linux-headers-4.4.0-109-generic linux-image-4.4.0-101-generic linux-image-4.4.0-103-generic linux-image-4.4.0-104-generic linux-image-4.4.0-108-generic linux-image-4.4.0-109-generic linux-image-extra-4.4.0-101-generic linux-image-extra-4.4.0-103-generic linux-image-extra-4.4.0-104-generic linux-image-extra-4.4.0-108-generic linux-image-extra-4.4.0-109-generic Use 'sudo apt autoremove' to remove them. 0 upgraded, 0 newly installed, 0 to remove and 111 not upgraded. 4 not fully installed or removed. After this operation, 0 B of additional disk space will be used. Setting up linux-image-extra-4.4.0-116-generic (4.4.0-116.140) ... run-parts: executing /etc/kernel/postinst.d/apt-auto-removal 4.4.0-116-generic /boot/vmlinuz-4.4.0-116-generic run-parts: executing /etc/kernel/postinst.d/dkms 4.4.0-116-generic /boot/vmlinuz-4.4.0-116-generic run-parts: executing /etc/kernel/postinst.d/initramfs-tools 4.4.0-116-generic /boot/vmlinuz-4.4.0-116-generic update-initramfs: Generating /boot/initrd.img-4.4.0-116-generic W: mdadm: /etc/mdadm/mdadm.conf defines no arrays. gzip: stdout: No space left on device E: mkinitramfs failure cpio 141 gzip 1 update-initramfs: failed for /boot/initrd.img-4.4.0-116-generic with 1. Change-Id: I79396162c5300c8cbaecc474473af81842f79db8 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-28Update git submodulesGeorg Kunz1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Removing old INFO file The INFO file has been replaced by the INFO.yaml file. Change-Id: I818697134cbb380a318237fdf593d7b6bf95ec04 Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Move run-functest.sh execution out of ansible Change-Id: I40195f08012774c22178a27f146c402b33ecd8fc Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-02-28Update git submodulesGeorg Kunz1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Removal of Wenjing Chu from the list of committers https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2018-February/020497.html Change-Id: Ic2b536551d919e9b66f41ba00dd6dc8b71d93f7b Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2018-02-28Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Update CVP Docker Compose Configuration - Uses extra files config.env, vhost.env to hold environment variables for docker configuration. - Provides samples for these config that can be copied and modified to fit deployment requirements. - Updates the docker images to the newest releases. Change-Id: Ibe9b8597edfb38940297433708497c244200d0af Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[armband] Add os-nosdn-ovs-ha scenario" - [armband] Add os-nosdn-ovs-ha scenario Added triggers for os-nosdn-ovs-ha scenario and reshuffled the other jobs To be merged after https://gerrit.opnfv.org/gerrit/#/c/52491/ is merged JIRA: ARMBAND-343 Change-Id: I35614637f1f4aac459dbb3d49be4bdd33174ca92 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add xtesting project job" - Add xtesting project job It mainly inherits from functest project jobs. xtesting is used everywhere except for project name which has to be functest-xtesting from the time being. Change-Id: I2c00c01b567b3c65b7acdec5c29b8c839d068366 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Functest] Run k8s tests on Joid" - [Functest] Run k8s tests on Joid Change-Id: I43ba42b2181b7f89a3f551a12eed4ab42d89cbee Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Modify the daisy slavel-label in yardstick daily jobs" - Modify the daisy slavel-label in yardstick daily jobs Accoding to https://gerrit.opnfv.org/gerrit/#/c/52063/, the jobs of daisy master branch have been moved from zte-pod3 to daisy-baremetal. Change-Id: I6f2a93bd89f606c0506ef2bf60fe67f96ade0571 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-02-28Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "change Dovetail CI jobs on Fuel" - change Dovetail CI jobs on Fuel 1. run test suite default on Fuel on Tuesday for HA scenario 2. run test suite proposed_tests on Fuel on Monday, Wednesday and Friday for HA scenario JIRA: DOVETAIL-613 Change-Id: I67ef5d7dddfee01817b933ae3eeccf704924f9b0 Signed-off-by: xudan <xudan16@huawei.com>