summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-07-21Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Change default verify scenario Since our default scenario os-nosdn-nofeature-ha is failing functest in verify, switch to os-nosdn-nofeature-noha which is passing. We want the lowest bar possible for initial patch set verification and then can use gate to verify more complicated deployments. Change-Id: I9788495de5ee728fa3c19264120315e562d2712d Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-20Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Dovetail] Bugfix: Dovetail CI jobs failed on compass" - [Dovetail] Bugfix: Dovetail CI jobs failed on compass Change-Id: I1b46fe380b12552651c786b10f162111d4605353 Signed-off-by: xudan <xudan16@huawei.com>
2018-07-20Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Removes branch from functest scenario Branch is messing up functest detection of deploy scenarios. Therefore this patch removes the branch from the scenario before passing it to the test job. Change-Id: I1b59125941e839f1937cba565c73e39efb460573 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-20Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Fix OS branch detection on snapshot promotion Change-Id: I4f860f9b9adcc96d94b1daa333eec7a746bc91b1 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-19Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: More snapshot fixes Changes-Include: - Use correct csit env file with promote jobs - Ensure odl container starts when snapshots brought up - Use SDN_CONTROLLER_PASSWORD for ODL pass rather than hardcoding admin Change-Id: I910a4eefa2b4c621e3f82939bedee338fad91bf3 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-19Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Update CI Resources and Requirements" - Update CI Resources and Requirements Indicates what requirements each resource type should meet in order to be considered part of OPNFV CI along with listing of the resources available. Includes a list of labels applied to servers and their intended use. JIRA: RELENG-403 Change-Id: I0ba2671e95e29141d051019938fba930a42e7f56 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-07-19Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Dovetail] Edit the job's name of Dovetail running on Apex" - [Dovetail] Edit the job's name of Dovetail running on Apex Change-Id: I92b8bbef1a979c16a9c62f1affe43817214936a4 Signed-off-by: xudan <xudan16@huawei.com>
2018-07-19Update git submodulesxudan1-0/+0
* Update docs/submodules/releng from branch 'master' - [Dovetail] Edit the job's name of Dovetail on Fuel Change-Id: I6a2b571ca2696f9466a4588b7e4deef13b947eae Signed-off-by: xudan <xudan16@huawei.com>
2018-07-19Update git submodulesYang (Gabriel) Yu1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - add support of dpdk for bottlenecks_ping This patch is supposed to be coordinated with https://gerrit.opnfv.org/gerrit/59901 to support dpdk scenario for Bottlenecks JIRA: YARDSTICK-1332 Change-Id: I4ae3d05523d0624d689702cb8eb23be364830de1 Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit 60b2c02f3968d84df339b491d659b6549bfc3771)
2018-07-19Update git submodulesYang (Gabriel) Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/fraser' - add support for dpdk scenario Dovetail test ran by bii shows that dpdk var needed to be set to let VM be successfully created by openstack Change-Id: I44ab09f313e38942ff1175ad05fc7521f49b855b Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit b928421d61a01f819bd0f059b1c3b0463dfd5d6f)
2018-07-18Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Delete the right dir when building functest-vnf It reduces a lot the size of the docker image. Change-Id: Ifd577169697b33dfd89594e8dd3afe4aa34ec7f9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 2dcec69c4e9ed34d7046afa694e738c040be02e9)
2018-07-18Update git submodulesYang (Gabriel) Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/fraser' - update release note for fraser 6.2 Change-Id: Ifcafaa6df33b654d8a62a2b5d179701737e12fdc Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit b7a10fea892cc43b58ca9b48ca2a754b859b066d)
2018-07-18Update git submodulesYang (Gabriel) Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/fraser' - Adjust the doc for stess ping test Some changes of stess ping test have been made for Dovetail. The patch is to adjust the doc to the new changes. Change-Id: I7c6c6fb0f1f60849ec440068fabdf601d76655f1 Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit 5863f141195f79e53c3e70fc62e1593cdc4e6800)
2018-07-18Update git submodulesYang (Gabriel) Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/fraser' - Delete unmaintained/useless tests Change-Id: I0c0606befb4e53fb503d9e5fcbf7d3bdf2237824 Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit 857d64c56d918f7925e65cfc7e49dbe391454864)
2018-07-18Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[dovetail] Run mandatory and optional test cases with 2 jobs" - [dovetail] Run mandatory and optional test cases with 2 jobs JIRA: DOVETAIL-694 Change-Id: I19928d57c14f99e5c3ed7725fbe3476096b1674c Signed-off-by: xudan <xudan16@huawei.com>
2018-07-18Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[dovetail] Add TESTAREA to support run mandatory or optional test cases" - [dovetail] Add TESTAREA to support run mandatory or optional test cases JIRA: DOVETAIL-694 Change-Id: I4d2f4342bb10b5199c0dd1ed6ee579df14cb1517 Signed-off-by: xudan <xudan16@huawei.com>
2018-07-18Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Dovetail] process name configuration for HA test cases on Fuel" - [Dovetail] process name configuration for HA test cases on Fuel In a Fuel deployment, the control processes are distributed across multiple VMs and the HA test cases need to know where to find which process. JIRA: DOVETAIL-688 Change-Id: Ib20f6ab117aa83d148f9e1a351a4f94ec1192146 Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2018-07-18Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[dovetail-webportal] Edit verify job" - [dovetail-webportal] Edit verify job Set the verify job of the webportal to be 'echo hello world' temporarily. Change-Id: Ib9c749572a629595593405fba6ae275d2dc90563 Signed-off-by: xudan <xudan16@huawei.com>
2018-07-17Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: change detect script to just include-raw Change-Id: I2366cbaba46734877782951365a4abebca9d17b8 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-17Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Fix snapshot scenario detection Change-Id: I4b18d441ebc4f9b9ac8c8c67415b8817f3091ee9 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-17Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Ensure docker prunning can be done" - Ensure docker prunning can be done Sometimes the docker build fails and the docker process hangs on a container, withouth being able to stop it. This causes spurious failures on other builds that shouldn't fail. The prune job should cleanup the hanging containers and images, but it fails when the docker process is hanged. This change adds a docker restart to the prune job, in order to assure that the hanged container is shut down and can be removed. JIRA: ARMBAND-358 Change-Id: I9d04fa1099a6fc53bf773a2eba33be89db7d0aa1 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-07-17Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Run ODL CSIT on Apex from Cperf container" - Run ODL CSIT on Apex from Cperf container This patch adds the ability to deploy a cperf container and execute ODL csit against an OPNFV deployment with ODL. The cperf job to execute csit requires an RC file, SSH key to access OPNFV nodes, and a yaml descriptor file that contains per node information about each control/compute node. This patch also adds triggering the cperf CSIT job inside of the 3rd party ODL netvirt verification suite. That job uses Apex snapshots to bring up deployment (no undercloud). Additionally this patch includes some changes to allow multi version snapshots to work. Multiple snapshots are now being created for different OpenStack branches along with noha or HA type topologies. This patch includes the ability to detect the desired scenario as triggered by ODL Netvirt gerrit. Now in ODL netvirt gerrit a user may provide: "check-opnfv <OS version>-<noha|ha>" style syntax to initiate 3rd Party OPNFV CI on a particular OS version/HA setup. Change-Id: I51a27545c985ce74c1c72fe0933eb451939a8c05 Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com> Signed-off-by: Tim Rozet <trozet@redhat.com> Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
2018-07-17Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: add k8s deployment to daily Change-Id: I01ac2d25615f189851bc033d156aacc155233913 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-16Update git submodulesspisarski1-0/+0
* Update docs/submodules/snaps from branch 'stable/fraser' - Cleaned up extra network created in the test test_set_one_port_two_ip_two_subnets() JIRA: SNAPS-323 Change-Id: I7610d7b3d2262b0f75c9620d2ec6907b62458158 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2018-07-16Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/snaps from branch 'stable/fraser' - Switch to OS::Neutron::FloatingIPAssociation OS::Nova::FloatingIPAssociation is hugely deprecated and doesn't work with latest OpenStack Queens deliverables. Change-Id: Icc43ba8a3466efbcc03e190b7e56f84eb69b7e51 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 89a0e76315c0ec123e3674536fcda07a6c9c3c06)
2018-07-16Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add verify jobs for new repo dovetail-webportal" - Add verify jobs for new repo dovetail-webportal JIRA: DOVETAIL-671 Change-Id: I4e55123f211f91f9e783d741251bc1fd9df62b85 Signed-off-by: xudan <xudan16@huawei.com>
2018-07-16Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[dovetail-webportal] Add docker build jobs for dovetail-webportal" - [dovetail-webportal] Add docker build jobs for dovetail-webportal Add 2 docker build jobs for the new repo dovetail-webportal. One is dovetail-webportal-api, the other is dovetail-webportal-web. Once there is a new patch merged, it will auto trigger the jobs to build and upload the new docker images with tag 'latest'. According to the Dovetail release plan and develpoment of the web, can tag this repo and release with certain tag (e.g. ovp.2.0.0) JIRA: DOVETAIL-671 Change-Id: I1becc084617bb52f8c8e23275202bd7be4a7b2b3 Signed-off-by: xudan <xudan16@huawei.com>
2018-07-14Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Temporarily disable HOT including OS::Nova::FloatingIPAssociation Change-Id: I31b76c5b3604845367c10f6e5d55c415042f6d47 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 59ba5abb31018282bca796ee0c0652d61192c6bf)
2018-07-13Update git submodulesYang (Gabriel) Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/fraser' - Change OS exporter 1. The name of prometheus OS exporter is too long messing up the display of docker ps. 2. Add version management of the exporter Change-Id: I3b634f2b3a274935ef27c0bcddeae3900170aebe Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit 42a6613ff51c20c90f5c81348943f3de50f4b21c)
2018-07-13Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Force new project.id when creating new users Else it raises side effects when both project.id and project.name are defined (see Apex [1]) [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/148/console Change-Id: I98665ed55a55fdd02e25d8ad17b78d84548b0ec8 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit ff0ae3f577311611f8c7ad9ef21370c439e8565b)
2018-07-12Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Disable fraser daily Change-Id: Iad2503baca32175ff912c85dccd71791fc8156ff Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-12Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Update blocking for csit promotion job Ensure only one csit promotion job runs on a node at a time. Change-Id: Iab36f267f880347e0090fd87b91c9d7e28fbc4f4 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-12Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Apex: Allow for multi-version snapshots" - Apex: Allow for multi-version snapshots This patch adds ability to manage multiple snapshot versions. We want to be able to have snapshots for noha and ha for multiple OS releases. This adds that capability and updates the deploy script to be able to deploy them. Also a user can specify which scenario to trigger with his ODL netvirt commit by doing 'opnfv-check <os version>-<ha|noha> Change-Id: I3884b41c86b55c187becfb83ef62f3431724d09e Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-12Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "unh-pod1: disable trigger for deploying auto" - unh-pod1: disable trigger for deploying auto Change-Id: I364ff339db7132b6a2ca31d15b6340542b6a9226 Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
2018-07-12Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Merge "Sample VNF version need to be updated to Fraser" into stable/fraser - Sample VNF version need to be updated to Fraser JIRA: YARDSTICK-1289 Change-Id: Ib150fafdfcc7a7aa09e4ed9c683fc3013676dac4 Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> (cherry-picked from commit 41777f75f551e6c448d21c9cf29d4e2967268f98)
2018-07-12Update git submodulesDimitrios Markou1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Change "monitor" to "assert" in SLA Change "monitor" to "assert" in SLA to make an Overall testcase to fail if a subtest Scenario fails JIRA: YARDSTICK-1305 Change-Id: I90f5c95f0ddace160d751a435d60ae09a42101f2 Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com> (cherry picked from commit 2552e6fd05ef1432992a2ef538dc31c6a2247ea4)
2018-07-12Update git submodulesDimitrios Markou1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - [Bug fix] Execute teardown if SLA is set to "assert" In Duration runner if SLA is set to "assert" and a SLAValidationError happens then a teardown is needed to avoid garbages in the environment. JIRA: YARDSTICK-1291 Change-Id: I9056b0da3e7e496171ed42430ffc340b5c68f108 Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com> (cherry picked from commit 30fc9f545d526fdbd69af483b0bad0ea781d648c)
2018-07-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Protect vs former interface format Compass still set publicURL [1] [1] https://build.opnfv.org/ci/view/functest/job/functest-compass-baremetal-daily-fraser/lastFailedBuild/consoleFull Change-Id: I88c6ca336a7017f97f4c07719156e567d1afb9df Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 06b9ace7a0333d723972502ab3ce5784b6cba689)
2018-07-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Avoid duplicating tempest section in rally.conf Change-Id: I79598cce2c7dfe0a2e969ddd32735c3eb189fa7a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 8b912cec489a96178fcac5667c03e20850149c3a)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Reuse the right detected role name It completes "Try to get Member or member role" [1][2]. [1] https://gerrit.opnfv.org/gerrit/#/c/59661/ [2] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/144/console Change-Id: Ib38b513906b08d6f85834e03f5415e83b66b733b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 1222e8c0f3699c5d74c54df11e5cdf00fd468b59)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Add tempest section in rally.conf It completes the previous patch [1][2]. [1] https://gerrit.opnfv.org/gerrit/#/c/59681/ [2] https://build.opnfv.org/ci/view/functest/job/functest-compass-virtual-daily-master/555/console Change-Id: I93ad9db2c7a8a0691fed8bf58f5e21d8f3dc9c57 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit bf39607ee1128f6a9b46c37c0a8ac1e582d39ea5)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Clean all possible resources It checks all openstack resources before cleaning. It allows removing images even if the test fail quickly. Change-Id: I1763b8a70fa7ffeb03c435e8e775c7afd1a7adac Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 6166caffe31888ef237874fdcaf088ac4ff8d003)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Cover vping_ssh Change-Id: I37c52057a45d76e081a1a0145baee96041ca25a5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 98d1a3d8b9beae43f2dacdc79309c39c2435feed)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Fix delete_keypair arg It uses keypair name instead of id as expected by Shade. It also increases timers as it boots an ubuntu VM. Change-Id: I8cd131e7c7a94c8f6b0fcc54a4d75ef8af31b807 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit e2e68a3806dc89fdc35cc7925b2c6c4118d5569d)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Check the status of inherited steps Change-Id: If63c228f2844194279b560515f4ab24a4ee88be0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 4fb7e1330137fb77ed1b29bbc7c1491b6e12d9b6)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Force result = 0 if exception self.result can be positive due to intermediary steps (scenarios). Else it can return false positives [1]. [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-virtual-suite-master/113/console Change-Id: Iecadee7f7380fda5273a0668aff1b441647c45aa Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit f83c5fc1f0ecd3b93a39b3cf90ed9cd478cb37a6)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Update rally image name regex The default value doesn't conform with our image names. Else it downloads the image from internet which may be not possible (offline testing, proxy or deployment l3 issues [1]) [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-virtual-suite-master/113/console Change-Id: I7d951967784d591e7155fe8582299aaa9b680b10 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 8c5703e4e2382f7091aa7f8008d65ce68fa0bf56)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Print all debug messages in a second file All modules are allowed to print in functest.debug.log. Change-Id: I9c0be258dba985c9d3171bc2d324464e41e1c584 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit b1f50e31dccb8fa3badd61c57ec76b8b4abb4510)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Try to get Member or member role Keystone roles are case insensitive and Apex declares member which couldn't be detected. Then conflict occured when creating the mandatory role [1]. It now searches the default role in lower case too. [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/141/console Change-Id: I687ecfe768ab4717fdb42a135c4bf9b76733ffd9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 4f89564b20e9c3462614706a616d469540631786)
2018-07-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Define one logger per key module Snaps is printing lots of error messages which makes user confused. It will decrease the size of functest.log. Change-Id: I2c7d8ec968350563fbfbd62dcc2fc39b13b39a78 Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com> (cherry picked from commit 3f4e49c480ac9a72c76c7c8435caad2fcf81abf0)