summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-11-08Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Sort CentOS build server package to be installed" - Sort CentOS build server package to be installed Sorts the package list alphabetically so its quicker to read which packages are installed. Change-Id: I784cfa773aed226301017d5ea64f0485e60c1c4e Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - [fuel, armband] RTD: Enable Gambia stream Change-Id: I97631f1d4902f8b8d3c2de8c4b086ffbad40a0f2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-11-07Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Enable Promise Documentation Verification As the tox file and 'docs' env now exists, the promise rtd job can start voting. Change-Id: I113bf4b4ef58a4c3339242a1542780cac85fffb5 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-07Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Only trigger docs-verify-rtd-master for opnfvdocs also remove hacky logic that deletes opnfvdocs clone and then clones project Change-Id: I4c0687af6d31b6759e0f6ccf275d968b9d71a7d9 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
2018-11-07Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Stable Branch Jobs for container4nfv" - Create Stable Branch Jobs for container4nfv Change-Id: Icc0999a5f9dcb2052dc34e21c8de754e9aec0909 Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-07Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create stable gambia branch for container4nfv" - Create stable gambia branch for container4nfv Change-Id: Ifb9649f17c951af36a7519cb6d8e07f633280763 Signed-off-by: Xuan Jia <jason.jiaxuan@gmail.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-07Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Gambia Stable branch for Availability project" - Gambia Stable branch for Availability project Creating the Gambia stable branch for availability JIRA: HA-32 Change-Id: Ie697ba88703f13a3447084340ee06d934fe51cc9 Signed-off-by:fuqiao@chinamobile.com Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-07Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Gambia branch for Edge Cloud Project" - Create Gambia branch for Edge Cloud Project Creation of the Gambia stable branch for the edge cloud project JIRA: EDGE-1 Change-Id: I87c787a5abfc82f6e71c55fb1593836dd86ef2c8 Signed-off-by: fuqiao@chinamobile.com Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-07Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Stable Branch Jobs for vswitchperf" - Create Stable Branch Jobs for vswitchperf Change-Id: I0918448fc96f49d51a2657bad5538ce9e6af990c Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
2018-11-07Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "VSPERF: Gambila Stable Branch" - VSPERF: Gambila Stable Branch Change-Id: I2bff1e3e549cf3afbbb295f2959dc8f983c3ee9b Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
2018-11-06Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[dovetail] add gambia jobs" - [dovetail] add gambia jobs Change-Id: I84e29a6d1ffaed59b2490f4c2e417c0456eb2ca7 Signed-off-by: xudan <xudan16@huawei.com>
2018-11-06Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Adding Doctor opnfv-7.0.1 tag" - Adding Doctor opnfv-7.0.1 tag Change-Id: Iaf0ff80c5716aa2051c04b0241a2d19d1709f0f1 Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
2018-11-06Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Fuel RTD job was missed Adding it back, I removed it from fuel-project-jobs and forgot to add it back as its own file Change-Id: I9d84a979cd5323d72ec858b310cb1b786c5f1207 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
2018-11-05Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Update Global JJB to v0.26.1 Release notes: https://docs.releng.linuxfoundation.org/projects/global-jjb/en/latest/release-notes.html#v0-26-1 XMLDIFF: https://hastebin.com/abojibiguh.bash Change-Id: I3e9c50c5efee331b7f05ecebb8bfe7e554a95f68 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
2018-11-05Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Fix SFC Verify Job Virtualenv Location '/var/cache' isn't writable by others, but /var/tmp should be. Also fixed the issue of not sourcing 'activate' within the bin path. Change-Id: Ib7830cc33543227d6b67cac00edc212d889aec10 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-05Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Install Tox in a virtualenv for SFC This should alleviate the current issue with tox version conflicts caused by global-jjb limiting the tox version. Change-Id: I84644be109963a612c0679cb58f21b0daf649e56 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-05Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[XCI] Remove inventory for prepare-tests.yml" - [XCI] Remove inventory for prepare-tests.yml We are finally fetching all ODL variables from inside the scenarios. Therefore, we don't need to use the inventory: ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py Change-Id: I91d17cb899a037887bc97441a1c1e37ff57b4850 Signed-off-by: Manuel Buil <mbuil@suse.com>
2018-11-02Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Deploy Pharos Dashboard on changes to compose file" - Deploy Pharos Dashboard on changes to compose file Instead of deploying the dashboard when changes to any file happens, only changes to the docker-compose.yml file should trigger a deploy. The deployment process would then be as follows: - Tag pharos-tools - Create a patch to set the tag in 'docker-compose.yml' - Merge the patch - New version of dashboard deployed at specific tag Change-Id: I67a6237f00b96021df24e7a79a063d31f43df5a6 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-02Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[dovetail] disable Dovetail jobs on master" - [dovetail] disable Dovetail jobs on master As Cedirc suggested, Dovetail should only run in Installers' Gambia jobs because Dovetail now integrates Functest Gambia. Disable Dovetail master jobs. Change-Id: Id39993801b6f98e77fc1a86f4c099b01bcfa8770 Signed-off-by: xudan <xudan16@huawei.com>
2018-11-02Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Fix Pharos Dashboard JIRA Logins" - Fix Pharos Dashboard JIRA Logins If the dashboard is built locally, the keys get copied to the right place, but as the dashboard images are now pulled and built remotely, the JIRA keys need to be copied into the running web container. Change-Id: Ia5edb4f994465ab2626973b8a36add9bc80a0d9d Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-02Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Enable odl-bgpvpn-noha daily job on fuel" - Enable odl-bgpvpn-noha daily job on fuel JIRA: FUEL-393 This patch enables odl-bgpvpn-noha scenario on daily jjbs for fuel installer. Change-Id: I89e85ee004c08aea07714e678fb223a7721b29ec Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
2018-11-02Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Fix functest docker tag in gate job Fixes passing quotes as the value for the variable, so now what is passed is just an empty string. Change-Id: I9abb681374934fe4cf7c8024118278674880f7e9 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-11-01Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[builde servers] Update manifest-tool URL" - [builde servers] Update manifest-tool URL The fact returned for 'ansible_architecture' is 'x86_64' for non-ARM servers. Hard coding this now in order to pull the correct URL of the manifest tool. When arm build servers are included in this list we'll set a fact for the architecture needed in the URL. Change-Id: I1c89e8a87cc7f2ae386973f3f1088f881ae5df71 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-01Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Update Pharos Dashboard Jobs" - Update Pharos Dashboard Jobs Moves the pharos dashboard jobs to their own file sperate and deploys the dashboard when changes are merged to master. Note: this may need to be manually triggered due to the timing between the container being built and it being availble to be pulled. Also includes the following changes to the job: - Uploads backups to Google Storage - Remove sudo usage as docker can be ran as the Jenkins user - Renames jobs to match general naming scheme JIRA: PHAROS-394 Change-Id: I516c4414d7b0158f1f8478214c10f0aa7d176739 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-11-01Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add builds for Barometer DMA docker image" - Add builds for Barometer DMA docker image Push OPNFV docker builds for barometer-dma image Change-Id: I50373233254b8315c48544bae916ccf8485e640d Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com>
2018-11-01Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Disable jobs on zte-virtual5" - Disable jobs on zte-virtual5 This node has been offline for some time. Disabling the jobs queued for it to reduce the queue until it comes back online. Change-Id: I305dc0376c331d244599dbb4edda2e3b880383be Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-31Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove References to Securedlab" - Remove References to Securedlab PDF/IDFs have been moved out of securedlab to the Pharos repo. Any references to pulling the files from securedlab have been changed to look in pharos. Change-Id: I04608da51afdbe9ec55e3dd23c501c99946b58bb Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-31Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Disable Flex jobs" - Disable Flex jobs Both flex PODs have been offline for a while. Disabling the Apex jobs scheduled on them will reduce the queue and they can be re-enabled once they come back online. Change-Id: I2f82379225ae6fc728fc655680e5ee8799a4bbbb Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-31Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[fuel] Handle CI DEBUG mode" - [fuel] Handle CI DEBUG mode Change-Id: Id169e19cd465d264525bfde843e7764d4f4d5d16 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-10-31Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "joid: Disable jobs" - joid: Disable jobs This change disables JOID jobs to keep build queue shorter than it is now. They can be enabled back once its situation is clarified. Change-Id: I5acdb60e5a827899fd86084a949e940d69b0a7ac Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-10-31Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/releng from branch 'master' - Set tags for first gambia and hunter releases Change-Id: Ia48c3dce052de255fb15ecbfc02656b9ed3e7f52 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-30Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/releng from branch 'master' - Revert "Avoid jenkins substitutions" This reverts commit 00431827b1a41f55fb700e69bfb229ccebc9c3f0. Change-Id: I77f0500b5e712745799dc9a7c7b94ce840e1f148 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-30Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - [Apex] Move Functest Scenario selection to script When using 'shell' builder directly '{}' is interpreted as a JJB substitution. This can be escaped with '{{}}' but breaks due to Apex use of Jinja2. Moving the entire script to a shell fixes this issue. Change-Id: I874a45cf25ca69373275849f98c89c534f3de0bb Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-30Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Fix ODL restconf port if Compass" - Fix ODL restconf port if Compass It conforms with the previous port which was hardcoded in odl.py. The default value (8181) seems wrong [1]. [1] https://build.opnfv.org/ci/view/functest/job/functest-compass-baremetal-daily-gambia/7/console Change-Id: I9142d4f20a29b1f46b06bb1fed5569a299f55eff Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-30Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Write the right default values in DOCKER_TAG" - Write the right default values in DOCKER_TAG It avoids facing with wrong substitutions [1] [1] https://build.opnfv.org/ci/job/functest-apex-baremetal-daily-gambia/23/console Change-Id: I4b8c990add51024d7984cd10668a33dd7c50c395 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-30Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Avoid jenkins substitutions" - Avoid jenkins substitutions It's currently failing as DOCKER_TAG is replaced by '' [1]. [1] https://build.opnfv.org/ci/job/functest-apex-baremetal-daily-gambia/21/console Change-Id: I3737c683fd85f6c426fdf2720b016f3452eab0b6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-30Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Stable Branch Jobs for bottlenecks" - Create Stable Branch Jobs for bottlenecks Change-Id: I1ddfca1afcaecf5068814276c64d312cf40455b4 Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-30Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add the huawei-pod8 into CI pod list" - Add the huawei-pod8 into CI pod list Add huawei-pod8 into CI pod list for running the functest-kubernetes. Remove the arm-virtual3 pod from CI pod list. Change-Id: I0aec57f41fc4a49302e687a2600417eea6c29a0b Signed-off-by: Jingzhao Ni <jingzhao.ni@arm.com>
2018-10-30Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/releng from branch 'master' - Fix param serialization in apex jjbs DEPLOY_SCENARIO wrongly contains DOCKER_TAG [1]. [1] https://build.opnfv.org/ci/job/functest-apex-baremetal-daily-gambia/20/console Change-Id: I85ddd47e4c15b36f507684d6d7fb9b0d90347507 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-29Update git submodulesearrage1-0/+0
* Update docs/submodules/releng from branch 'master' - Modify clovisor name to fit naming convention - Edit name of container from clovisor to clover-clovisor to match naming convention Change-Id: I37a7e6f4cdb5295bd8a0e92dcc3f8c43605adcb8 Signed-off-by: earrage <eddie.arrage@huawei.com>
2018-10-29Update git submodulesearrage1-0/+0
* Update docs/submodules/releng from branch 'master' - Add builds for Clover Spark and Clovsior - Push OPNFV docker builds for clover-spark, clover-spark-submit, and clovisor containers. Change-Id: If42ab565a48569137153511aa109bbaeeb6968aa Signed-off-by: earrage <eddie.arrage@huawei.com>
2018-10-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "bottlenecks gambia branch" - bottlenecks gambia branch Add Gambia branch to Bottlenecks project Change-Id: Ie698b459abcb066ac767dee72f957b9c96c7eabd Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create Stable Branch Jobs for auto" - Create Stable Branch Jobs for auto Change-Id: I1541a0e277891b526a671953bf33daab842b524e Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-10-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Run Doctor fault management and maintenance in baremetal" - Run Doctor fault management and maintenance in baremetal Run also fault management in Nokia POD to have baremetal results Change-Id: I55afee4c42365ca5d302c8ead4cbf0ad3b956e74 Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
2018-10-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[fuel] Define Docker tag for stable branches" - [fuel] Define Docker tag for stable branches Change-Id: Ic3c99eee282641eb15880fe18578cbee534308e5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-10-29Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Write tempest_conf.yaml for all OPNFV installers" - Write tempest_conf.yaml for all OPNFV installers It follows "Move tempest logics in tempest_conf.yaml" [1] and then allows passing tempest_full and tempest_scenario in OPNFV gates. It set all params for all OPNFV installers according to their last runs [2][3][4]. Live migration is out of that custom params as it's currently considered as a key feature [5]. tempest_conf.yaml should be installer-centric and shouldn't take scenarios into account. It's unclear which installers support glance API v1 which is deprecated. Any installer can ask for testing it if supported. At least Apex doesn't support it [6]. Shelve is currenlty disabled because testing it could fail the whole tempest run if unsupported. We are missing data about which installer may support it. [1] https://gerrit.opnfv.org/gerrit/#/c/64067 [2] Apex: https://artifacts.opnfv.org/logs/functest/lf-pod1/2018-10-25_02-17-25/tempest_full/tempest-report.html [3] Compass: https://artifacts.opnfv.org/logs/functest/huawei-virtual9/2018-10-24_04-54-25/tempest_full/tempest-report.html [4] Fuel: https://artifacts.opnfv.org/logs/functest/lf-pod2/gambia/2018-10-25_05-57-54/tempest_full/tempest-report.html [5] https://artifacts.opnfv.org/logs/functest/ericsson-pod1/gambia/2018-10-27_06-10-07/tempest_full/tempest-report.html [6] https://artifacts.opnfv.org/logs/functest/lf-pod1/gambia/2018-10-23_10-34-07/tempest_full/tempest-report.html Change-Id: I17c8a2d738daaf1c2e97755c99f8886da8a531aa Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-29Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/releng from branch 'master' - Define DOCKER_TAG in Functest daily job It defines DOCKER_TAG as parameter in Functest daily job. It also fixes DOCKER_TAG default value in properties files and then complete the previous commit [1]. It should fix the current gate issues [2]. [1] https://gerrit.opnfv.org/gerrit/#/c/64069/ [2] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-gambia/18/console Change-Id: Ia531ca68a455cc20294e123286062265b9b79d6f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-10-26Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/releng from branch 'master' - Set empty strings in DOCKER_TAG by default It let functest-alpine process branches right after [1]. [1] https://build.opnfv.org/ci/job/functest-apex-virtual-suite-master/241/console Change-Id: I6ed804fe9f3628f67421157433e09da3bcbf585c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-10-26Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Temporarily disable VNC tests At least Compass and Fuel configure Spice as console [1][2]. It disables vnc testing as it could fail for endusers as well. [1] https://artifacts.opnfv.org/logs/functest/huawei-virtual9/2018-10-24_04-54-25/tempest_full/tempest-report.html [2] https://artifacts.opnfv.org/logs/functest/lf-pod2/gambia/2018-10-25_05-57-54/tempest_full/tempest-report.html Conflicts: functest/opnfv_tests/openstack/tempest/conf_utils.py Change-Id: I2a1ecf345cb81170c1b1a3e49f8f3a58602fc3f0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit df9d5c5d3b80b613130de59a1810f7fce9cbbc0d)
2018-10-26Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[compass4nfv]Add missing jobs" - [compass4nfv]Add missing jobs This patch add the bottlenecks and dovetail jobs for compass Gambia branch. Change-Id: If5e4180c69c14042a075c68373a4262388f20da0 Signed-off-by: wutianwei <wutianwei1@huawei.com>