summaryrefslogtreecommitdiffstats
path: root/docs/submodules/releng
AgeCommit message (Collapse)AuthorFilesLines
2017-08-22Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "bugfix: OperationFailure: the limit must be positive" - bugfix: OperationFailure: the limit must be positive in cursor.aggregate(), set limit=0 is not allowed, in this patch, if no records to be listed, return empty list directly, no more aggregate() JIRA: RELENG-293 Change-Id: I7317892875da9c0f785ba010b55715032dee31ce Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-22Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "change scenario owner" - change scenario owner 1 bugfix owner must be explicit in ScenarioVersion model 2 change owner of scenario 3. usage: PUT /api/v1/scenarios/<scenario_name>/owner? \ installer=<installer_name>& \ version=<version_name> body: new owner Change-Id: I261468cd8445030b61e37e0f804b699d6205bdb0 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-22Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "update projects in scenario" - update projects in scenario 1. post, add one or more new projects 2. update, replace existed projects wholly 3. delete, delete one or more projects by name 4. in post&update, if schema is not consistent with ScenarioProject model, BadRequest will be raised(only extra keys will be detected currently) 5. in post, if project already exist, return Conflict with already exist message Change-Id: Iead585f787a4acc61abce6c9d38a036739b498d6 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-22Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "in swagger operation parameter supports array type" - in swagger operation parameter supports array type it will be used in scenario update process later Change-Id: Ic44023169f1c0da0946e5e60339ce58076fc8807 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-22Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "update customs in scenario" - update customs in scenario 1) post to add one or multiple test cases 2) update to substitute all the test cases 3) delete with body to delete one or multiple test cases 4) to facilitate the process and response body usually useless, if update success all updates(scores/trust_indicators/customs), return 200 with no response body Change-Id: I5148f172989fa8e0e70ffed92ee383c0520dbb41 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-22Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "prepare for testresults.opnfv.org's watchdog" - prepare for testresults.opnfv.org's watchdog Due to the frequent crash in testresults.opnfv.org, watchdog will be introduced to monitor the status of docker daemon/testapi container/reporting container, to make timely recovery, to make things clear, some refactors included in this patch: 1) leverage container name and image name rather than id 2) address three conditions during the update 3) refactor code to be more readable Change-Id: Ifa7a6fd94db62d532026b5fad33835b0e2abd9af Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-22Update git submodulesJun Li1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Modify tempest.conf to enable Tempest failed test cases to pass on Compass" - Modify tempest.conf to enable Tempest failed test cases to pass on Compass JIRA: DOVETAIL-486 For compass: 1. There is a defcore test case always failed due to wrong value of volume_device_name=vdc. Use tempest_conf.yaml to change the wrong value into 'vdb' for Compass. 2. There are also some tempest test cases skipped or failed due to wrong values in tempest.conf file. Change-Id: Ibe274790b14d9223b5c0ee903879f8b67521948d Signed-off-by: xudan <xudan16@huawei.com>
2017-08-21Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Fix passing current parameters to healthcheck job Change-Id: I370d2822071c77a16387935e1d465f608ee9e10e Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2017-08-21Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "add Calipso Jenkins job: run unit tests" - add Calipso Jenkins job: run unit tests Change-Id: I6ecb7f85d9cdfc3dadc7e3b6769daf3b6cb144b5 Signed-off-by: yayogev <yaronyogev@gmail.com>
2017-08-21Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "xci: Several bugfixes for the verify job" - xci: Several bugfixes for the verify job - Fix environment variables set by the job - Fix the default distro in deploy job since the {distro} is not passed to it - Navigate to correct directory where xci-deploy.sh is located Change-Id: Ie412dc4852a4aac5aae5c1f26bb271281ebbc111 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2017-08-21Update git submodulesJun Li1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Bugfix: No cirros-0.3.5-x86_64-disk.img" - Bugfix: No cirros-0.3.5-x86_64-disk.img JIRA: DOVETAIL-487 1. Functest cvp.0.5.0 doesn't have cirros image in its docker container. 2. Jobs need to download cirros-0.3.5-x86_64-disk.img and store it in $DOVETAIL_HOME/pre_config Change-Id: I12e4edb561ce21f813adc968d223fb0827529f7b Signed-off-by: xudan <xudan16@huawei.com>
2017-08-21Update git submodulesxudan1-0/+0
* Update docs/submodules/releng from branch 'master' - Use dovetail cvp.0.5.0 image in Dovetail CI jobs JIRA: DOVETAIL-483 Change-Id: I16fdba4e0d2d150b629ae1828578c7379999bfea Signed-off-by: xudan <xudan16@huawei.com>
2017-08-18Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Enable patchset verification for xci This job gets triggered when a new patchset to xci is created. Currently only the deployment is run and healthcheck will be activated once xci is adjusted for functest. Change-Id: I3ea61524de6c6b5e2d872f59bb362d9c9be6053c Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2017-08-18Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "bugfix: testapi is killed because of oom_kill" - bugfix: testapi is killed because of oom_kill if page is not provided, return page 1 to avoid large memory consume, further more to kill testapi: Out of memory: Kill process 30842 (opnfv-testapi) score 519 or sacrifice child Killed process 30842 (opnfv-testapi) total-vm:4739716kB, anon-rss:3974612kB, file-rss:0kB JIRA: RELENG-291 Change-Id: Id0e144c030aee390cc41cff8a48e3c997de4ad84 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-18Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "impl update trust_indicator in scenario" - impl update trust_indicator in scenario Change-Id: I1afe38412926778bc84d178dbbfc3fe0cde15f69 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-17Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - jjb: Remove jobs that belong to multisite Multisite project has been terminated. http://meetbot.opnfv.org/meetings/opnfv-meeting/2017/opnfv-meeting.2017-08-08-12.59.html Change-Id: Ia7c0bc86b2e8696f8c2f1fff3007d681c6e1cb8c Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - fuel-deploy.sh: source local_env from securedlab While at it, revert BRIDGE default value to "pxebr" after recent Fuel rework was merged in [1]. This mechanism will be leveraged by [2]. Partially reverts commit: 68195fd [1] https://gerrit.opnfv.org/gerrit/#/c/38855/ [2] https://gerrit.opnfv.org/gerrit/#/c/39521/ Change-Id: Ic61487384029a7d16547a5035a1f1b34ecbea8d4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: bifrost-verify: Disable errexit when uploading logs" - jjb: xci: bifrost-verify: Disable errexit when uploading logs The errexit option is there to catch failures when the job is executed. We don't want to mark the entire job as failed when we have troubles uploading the logs when the actual job has passed so we disable the errexit option to make the whole process less aggressive. Moreover, we move the build log upload to the end of the operation so we can catch as much output as possible. Change-Id: Ice126471a8c837c54c95c8ef0935c059d37ea91b Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-08-17Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: bifrost-verify-jobs: Kill the job after 90 minutes" - jjb: xci: bifrost-verify-jobs: Kill the job after 90 minutes Make use of the build-timeout macro to kill the job after 90 minutes which is more than enough for a bifrost job to finish. Change-Id: Ic7ffa8291d057bf22f7d97d017c00bd3f3b6f4a9 Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-08-17Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: global: releng-macros: Add timeout wrapper" - jjb: global: releng-macros: Add timeout wrapper Add new timeout wrapper which can be used to kill a job if it take too long to finish Change-Id: I15a20fc92ea7855d11983b5734064aace138a2b5 Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-08-17Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "jjb: xci: Use centos-minimal instead of centos7 element" - jjb: xci: Use centos-minimal instead of centos7 element The full distro elements are not well maintained. Upstream OpenStack also prefers the minimal elements when building images for the CI so we should do the same to minimize the delta between the two systems. Change-Id: Ifeddb0a74c2434df2cfa95cde36b4aaac1516698 Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-08-17Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[qtip] refactoring ci scripts" - [qtip] refactoring ci scripts - manage help scripts in qtip repo instead of releng - call entry script in qtip from releng JIRA: QTIP-268 Change-Id: Ibd0d2c2533c1a7f1963f6c3214c563499cce8b22 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-08-17Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "update scenario scores" - update scenario scores update score url: POST /api/v1/scenarios/<scenario_name>/scores? \ installer=<installer_name>& \ version=<version_name>& \ project=<project_name> add new score record interface add unit test add swagger specification Change-Id: Ib7bb31f303a9a9402325476bfdadb58aa0df560e Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-17Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "delete obsolete scenario update code" - delete obsolete scenario update code 1) update scenario will be subsitituted with new methods, in this patch delete the obsolete code first to make clean room 2) test_queryCombination() will fail randomly, in this patch disable it first, reopen when problem solved Change-Id: I1939876465934ea09894255712057a78f120be71 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-16Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove Python packaging files" - Remove Python packaging files Since we don't release releng as a python project, it doesn't make much sense to include a setup.py. The jjb testenv in tox.ini is modified to pin jenkins-job-builder and no longer require setup.py nor jjb/test-requirements.txt, and the modules testenv is moved to it's own tox.ini under modules. Locally testing of jjb can still be done using: tox -e jjb Change-Id: I512b1a8f9cd7d48a2f14b1bbe966b525793a6fe3 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-08-16Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "xci: Remove prototypes directory due to migration to releng-xci repo" - xci: Remove prototypes directory due to migration to releng-xci repo Change-Id: I3b8a1dff64151dc55f05e621bab61f2b214bfd05 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2017-08-16Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/releng from branch 'master' - bug fix: bad path on auto generated documentation bad path fix on https://gerrit.opnfv.org/gerrit/#/c/39141/ Change-Id: Ieb8023aa7fde620c2e6b755b8e6255d2281f7a90 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
2017-08-16Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "bug fix: bad path on auto generated documentation" - bug fix: bad path on auto generated documentation as mentioned in the jenkins logs [1], the folder is not correct replace functest/api/_ build by docs/api/_build [1]: https://build.opnfv.org/ci/view/functest/job/functest-docs-upload-master/48/console Change-Id: I40f4c08474ff017f1616d463b6c5165cd6514c32 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
2017-08-16Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Bug fix: generate fuel reporting page when no aarch64 available" - Bug fix: generate fuel reporting page when no aarch64 available In fuel we may deal with x86 or aarch64 architecture We generate dedicated reporting page - fuel@x86 - fuel@aarch64 However when there is no results for one of the architecture the test on the number of architecture lead to a bug Change-Id: I9906bd6078c8493587dc667eb23399a1e8311e77 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
2017-08-16Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add daisy to reporting" - Add daisy to reporting Change-Id: I5fd940b8c1be1c327cfcd481c27049f94ae2f175 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
2017-08-16Update git submodulesRyota Mibu1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[doctor] drop experimental job (profiler)" - [doctor] drop experimental job (profiler) doctor profiler is now enabled in default, we don't need this experimental job anymore. https://gerrit.opnfv.org/gerrit/33881 Change-Id: Ife6c81c0c45644ed3353c5b0b6011f33137edc14 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
2017-08-16Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: fixes test suite always running even when deploy fails According to the multijob builder, condtion: "condition (str) – when to trigger the other job". Other job in this case means the next job I believe. Change-Id: I084fffc80584ad683345f6040ec0081c16513c8d Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-08-15Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Update repository with new location of XCI" - Update repository with new location of XCI With the releng-xci code moving to it's own repository, the Jenkins jobs need to be modify to clone the correct repo and point at the right paths: * The git repo is changed to 'releng-xci' * The cloned directory is changed to '$WORKSPACE/releng-xci' * References to the 'prototypes' directory path have been removed Change-Id: Ia1d2ad0a2fb6cc9d1848356edf448b92ab67b017 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-08-14Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/releng from branch 'master' - Add odl-fdio-dvr scenarios to daily Change-Id: I6bd33b0304127dbcac1ccc4320a2a34e8a837d00 Signed-off-by: Feng Pan <fpan@redhat.com>
2017-08-14Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Pass jenkins variables to daisy deploy script" - Pass jenkins variables to daisy deploy script JIRA: DAISY-42 Now the daisy deploy script is executed with sudo. In [1], daisy deploy job needs to check INSTALLER_IP when it generates the configuration by the POD Descriptor File. So -E option of sudo is necessary to pass the jenkins variables. [1] https://gerrit.opnfv.org/gerrit/#/c/38657/ Change-Id: I852c115d1f0623100afef9979619e4770b5bd1d3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-11Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add jjb script for nfvbench to build the nfvbench VM" - Add jjb script for nfvbench to build the nfvbench VM Change-Id: I02b17840bdd03396b39401d03b1f9224cd899161 Signed-off-by: ahothan <ahothan@cisco.com>
2017-08-11Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[qtip] Update shell in qtip integration job" - [qtip] Update shell in qtip integration job Change-Id: I6c3fa3aaaf6f017a014a9e2294995e5a915fdbe8 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2017-08-11Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Rename odl_l3 to odl" - Rename odl_l3 to odl Rename all scenarios with "odl_l3" in their name in Euphrates to just "odl". Change-Id: If2bff0da79f79b9305771d2fc575db1606cd4bf9 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-11Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Initiate packetization of Testing reporting" - Initiate packetization of Testing reporting Testing reporting provides - static reporting pages [1] (jinja2) - landing pages including test case catalogue [2] (angular) It consumes the Test API to build web pages providing status for the testing projects (so far functest, yardstick, storperf and qtip). Dockerization has been initiated [3]. The goal is to replace the static page hosted on testresults.opnfv.org by a docker regenerated and redeployed when reporting code is changed But the docker and more generally the testing reporting directory must be refactored to - manage dependencies properly - leverage tox (py27, docs, pylint, pep8) This patch - setups tox (py27, pep8, pylint, docs) - integrate the requirement management - fix pep8 errors - introduce 1 dummy unit test This patch does not - fix pylint errors - create any doc [1]: http://testresults.opnfv.org/reporting2/display/index.html [2]: http://testresults.opnfv.org/reporting2/reporting/index.html [3]: https://gerrit.opnfv.org/gerrit/#/c/36735/ Change-Id: I4613de7ca7036d6c6bbb8f58ade492b1d673599b Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
2017-08-10Update git submodulesMartin Kulhavy1-0/+0
* Update docs/submodules/releng from branch 'master' - Don't convert JOID depl. mode from noha to nonha JOID is not using nonha deployment mode anymore. Reference change in JOID: https://gerrit.opnfv.org/gerrit/38973 Change-Id: Idc901551862d3936246afc06f0a97ab15d10b91d Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
2017-08-10Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Correct the description of the bridge used by daisy" - Correct the description of the bridge used by daisy Change-Id: I1aeed86489f7d42e3513a212f34df02c7efb12b9 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-10Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Fix error in qtip job template" - Fix error in qtip job template Change-Id: Ida62e630c1f26ed4058eb34dbd9d438fb6071387 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-08-10Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "add Pods page in webportal" - add Pods page in webportal delete OPNFV Powered Guidelines page add Pods page with create/list operations Change-Id: Ib9fd2834bd9d54ee33600458a90e3aac76382589 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-09Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Adds sfc scenarios to daily Change-Id: I900f9dc6e6dd3bf041fbecc5eab3216f5bd7f8bc Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-08-09Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Send 'Build Failed' Emails to Jenkins Admins" - Send 'Build Failed' Emails to Jenkins Admins Adds the 'email-jenkins-admins-on-build-failures' publishers for jobs which have overridden the default list of publishers. This will provide Jenkins administrators a time-series list of build failures to assist in debugging issues with the master and agents. JIRA: RELENG-257 Change-Id: I28f12877562113c9197ed6429ee2a7f3cdbaf346 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-08-09Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "KVMFORNFV: Implementing kvmfornfv daily jobs." - KVMFORNFV: Implementing kvmfornfv daily jobs. JIRA: RELENG-285 This patch includes updated scripts for implementing kvmfornfv daily jobs to add the new test name livemigration and trigger the livemigration testcase Change-Id: I4b32b14a85b87a386b8099b725ad11bc80ca9cdd Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>
2017-08-09Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "APEX: Add os-nosdn-kvm_ovs_dpdk scenarios to daily" - APEX: Add os-nosdn-kvm_ovs_dpdk scenarios to daily Change-Id: I8433b84bc2e2c3acf7db67b8bf40aedddb727daa Signed-off-by: Feng Pan <fpan@redhat.com>
2017-08-09Update git submodulesJun Li1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "remove useless workspace from yardstick" - remove useless workspace from yardstick There is a img file in this workspace, which consumes lots of disk space when CI collects artifacts Change-Id: Idef0624832cf2b12de2a63fc85bb65f4986ce0ca Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
2017-08-08Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/releng from branch 'master' - APEX: Add nosdn-ovs_dpdk scenarios to daily Change-Id: I0670eb1e0c698e2a57698ba0f11879a17a34c2ff Signed-off-by: Feng Pan <fpan@redhat.com>
2017-08-08Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "APEX: add ipv6 to daily job" - APEX: add ipv6 to daily job Change-Id: I9d080558ac6943f53d657cbec6c25dd2e6c10ac5 Signed-off-by: Feng Pan <fpan@redhat.com>