summaryrefslogtreecommitdiffstats
path: root/jjb
AgeCommit message (Collapse)AuthorFilesLines
2022-11-03Add job to push docker imagexuegao2-1/+35
Add jenkins job to push docker image for core nssmf simulator and ran nssmf simulator. Issue-ID: INT-2162 Signed-off-by: xuegao <xue.gao@intl.att.com> Change-Id: Iee8e434d2fcb70ec72c8b47f726eff5e1a165e9e Signed-off-by: xuegao <xue.gao@intl.att.com>
2022-10-27Create uui kohn branch jenkins project.hekeguang4-0/+8
Issue-ID: USECASEUI-744 Change-Id: Iab0c11c6644e27f92af586f7822c23fabef39757 Signed-off-by: hekeguang <hekeguang@chinamobile.com>
2022-10-24Merge "[INTEGRATION] Add Python ONAP SDK project to CI"Jessica Wagantall1-0/+54
2022-10-24Merge "[AAI] Update AAI to build kohn jobs"Jessica Wagantall11-22/+22
2022-10-24Add jenkins jobs for Kohn releaseliamfallon14-8/+50
Issue-ID: POLICY-4380 Change-Id: I86391b15b30c2d0a6b49013c431a9536caaee7ae Signed-off-by: liamfallon <liam.fallon@est.tech>
2022-10-24[AAI] Update AAI to build kohn jobswr148d11-22/+22
Issue-ID: AAI-3539 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I42062adafefcbc6ec12192059a3077e1341a0be7
2022-10-21[INTEGRATION] Add Python ONAP SDK project to CIMichal Jagiello1-0/+54
Issue-ID: INT-2150 Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl> Change-Id: I486811b71f947799882b517233ffab640a0c7a97
2022-10-20Chore: Deprecate WhiteSource jobsJessica Wagantall17-441/+0
It was decided on the TSC meeting Oct20 to depreate all WhiteSource jobs. Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: I0ea2544143d94e3985e804d4e01bdca968b07810
2022-10-20Add kohn branch builds for ccsdk,sdncTimoney, Dan (dt5972)12-0/+26
Add builds for kohn branch of CCSDK and SDNC Change-Id: Ia1fac628de78cceeef18e121c5b06fddabaa214d Issue-ID: CCSDK-3779 Issue-ID: SDNC-1746 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2022-10-19Merge "Revert "Chore: Temp disable ONAP Openstack cleanup job""Andrew Grimberg1-1/+0
2022-10-19Revert "Chore: Temp disable ONAP Openstack cleanup job"Matthew Watkins1-1/+0
This reverts commit 4994ec8533d7048d709c52ed804e057f543aeb85. Issue-ID: CIMAN-33 Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org> Change-Id: I630b4905c824ca37664de2fbfa2cd3c33d82ced5
2022-10-17[CPS] Add jobs for Kohn branchToineSiebelink6-17/+21
-Add jobs for Kohn for all CPS repos -Remove reduntant jobs (Istanbul no longer supported) -Add and correct jobs for CSIT (was missed during Jakarta update?!) Issue-ID: CPS-1318 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I4ee2127276f678011bfb967297a9146be99bee59
2022-10-15Chore: Temp disable ONAP Openstack cleanup jobMatthew Watkins1-0/+1
Issue-ID: CIMAN-33 Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org> Change-Id: I536323825e5cfe4471d28474783544f4160b2215 Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
2022-10-11[DCAE] Add Kohn branch and cleanup older branchesVijay Venkatesh Kumar25-58/+58
Remove jakarta branch with exception of dcaegen2 (doc) repo. Change-Id: I219f232188f0cfcb9203f27ab236cd14d4ac6cc6 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-3236 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
2022-10-10Chore: Deprecate VFC repoJessica Wagantall4-128/+0
Deprecate vfc-nfvo-driver-vnfm-svnfm as per IT-24623 Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: If57b57bd2c5d852a5c094eafa2de22eb4e7127df
2022-10-10Merge "[DCAE] Revert sbom generation for SDK repo"Jessica Wagantall1-1/+1
2022-10-10Merge "Separate Sonar for oran products"Jessica Wagantall1-1/+5
2022-10-10Merge "Add Kohn branch to SDC jobs"Jessica Wagantall11-0/+25
2022-10-10[DMAAP] Add kohn branchefiacor4-8/+8
Change-Id: Idf75c8b20e735d577b61506c987f3c97b5f36172 Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: CIMAN-423
2022-10-07Disable SBOM generatorTimoney, Dan (dt5972)10-10/+10
Disable SBOM generator to work around issue with release builds not installing maven artifacts Change-Id: I103ec516f5a46ea28e418fb6383424528ab4f944 Issue-ID: CIMAN-422 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2022-10-07Separate Sonar for oran productselinuxhenrik1-1/+5
Issue-ID: CCSDK-3688 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech> Change-Id: I8d8b3352ce0b4a5d9143c9e6c9d4ac1c60bc574b
2022-10-06[DCAE] Revert sbom generation for SDK repoVijay Venkatesh Kumar1-1/+1
Disable SBOM generator to work around issue with builds not installing maven artifacts Change-Id: Idd31ba4a38a48bd63f962ffe7785f82578c5ae06 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-3236
2022-10-04Disable SBOM generatormpriyank2-2/+2
- disable SBOM generator for CPS-Core and DMI plugin as we are unable to override the generated artifacts in the releases repo and it impacts new release creation. Issue-ID: CPS-1322 Change-Id: I399846bc36897f4144ad75178a2c33ac5fe479d7 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-09-30Add Kohn branch to SDC jobsMichaelMorris11-0/+25
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-4194 Change-Id: I79bd739b8a1320cebaf08802c58a87c5f6133f0d
2022-09-29Chore: Update CLM jobs to run only on masterJessica Wagantall50-168/+0
As requested in the TSC (Sep29), all CLM jobs should only be executed on the master branch. More in IT-24622 Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: If33ed94f7a4a71d79d4a226ef0e973e886955cfb
2022-09-29Merge "Enable SBOM on etsicatalog project"Jessica Wagantall1-0/+2
2022-09-30Chore: Revert back to ubuntu1804-builderBengt Thuree99-174/+174
jjb/aai/aai-aai-common.yaml jjb/aai/aai-babel.yaml jjb/aai/aai-graphadmin.yaml jjb/aai/aai-graphgraph.yaml jjb/aai/aai-logging-service.yaml jjb/aai/aai-model-loader.yaml jjb/aai/aai-resources.yaml jjb/aai/aai-rest-client.yaml jjb/aai/aai-schema-service.yaml jjb/aai/aai-sparky-be.yaml jjb/aai/aai-sparky-fe.yaml jjb/aai/aai-traversal.yaml jjb/ccsdk/apps.yaml jjb/cli/cli.yaml jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml jjb/dcaegen2/dcaegen2-services-mapper.yaml jjb/demo/demo.yaml jjb/dmaap/dmaap-buscontroller.yaml jjb/dmaap/dmaap-datarouter.yaml jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml jjb/dmaap/dmaap-messagerouter-messageservice.yaml jjb/externalapi/externalapi-nbi.yaml jjb/global-defaults.yaml jjb/holmes/holmes-common.yaml jjb/holmes/holmes-engine-mgt.yaml jjb/holmes/holmes-rule-mgt.yaml jjb/integration/integration-templates.yaml jjb/integration/integration.yaml jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml jjb/lab/lab-templates.yaml jjb/modeling/modeling-etsicatalog.yaml jjb/msb/msb-apigateway.yaml jjb/msb/msb-discovery.yaml jjb/msb/msb-java-sdk.yaml jjb/msb/msb-swagger-sdk.yaml jjb/multicloud/multicloud-framework-java.yaml jjb/multicloud/multicloud-framework-python.yaml jjb/multicloud/multicloud-k8s.yaml jjb/multicloud/multicloud-openstack-vmware-java.yaml jjb/multicloud/multicloud-openstack-vmware-python.yaml jjb/multicloud/multicloud-openstack.yaml jjb/music/music-distributed-kv-store.yaml jjb/music/music-jar.yaml jjb/oom/oom-registrator.yaml jjb/oom/oom-templates.yaml jjb/oparent/oparent.yaml jjb/openci/openci-onap-daily-jobs.yaml jjb/optf/optf-has.yaml jjb/optf/optf-osdf.yaml jjb/policy/policy-apex-pdp.yaml jjb/policy/policy-api.yaml jjb/policy/policy-common.yaml jjb/policy/policy-distribution.yaml jjb/policy/policy-docker-base-common.yaml jjb/policy/policy-drools-applications.yaml jjb/policy/policy-drools-pdp.yaml jjb/policy/policy-gui.yaml jjb/policy/policy-models.yaml jjb/policy/policy-pap.yaml jjb/policy/policy-parent.yaml jjb/policy/policy-xacml-pdp.yaml jjb/sdc/sdc-onap-ui-angular.yaml jjb/sdc/sdc-onap-ui-common.yaml jjb/sdc/sdc-sdc-be-common.yaml jjb/sdc/sdc-sdc-distribution-client.yaml jjb/sdc/sdc-sdc-docker-base.yaml jjb/sdc/sdc-sdc-pubsub.yaml jjb/sdc/sdc-sdc-tosca.yaml jjb/sdc/sdc-sdc-workflow-designer.yaml jjb/sdnc/sdnc-apps.yaml jjb/sdnc/sdnc-northbound.yaml jjb/sdnc/sdnc-oam.yaml jjb/so/so-libs.yaml jjb/testsuite/testsuite-python-testing-utils.yaml jjb/usecaseui/usecase-ui-intent-analysis.yaml jjb/usecaseui/usecase-ui-nlp.yaml jjb/usecaseui/usecase-ui-server.yaml jjb/usecaseui/usecase-ui.yaml jjb/vfc/vfc-gvnfm-vnflcm-java.yaml jjb/vfc/vfc-gvnfm-vnflcm-python.yaml jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml jjb/vfc/vfc-gvnfm-vnfres-java.yaml jjb/vfc/vfc-gvnfm-vnfres-python.yaml jjb/vfc/vfc-nfvo-db.yaml jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml jjb/vfc/vfc-nfvo-lcm-java.yaml jjb/vfc/vfc-nfvo-lcm-python.yaml jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml jjb/vnfsdk/vnfsdk-functest.yaml jjb/vnfsdk/vnfsdk-pkgtools-python.yaml jjb/vnfsdk/vnfsdk-refrepo.yaml jjb/vnfsdk/vnfsdk-validation.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Change-Id: I3f94e06cb75fb9840ab8d21ee5a59797a42ba67a
2022-09-30Chore: Revert back to ubuntu1804-dockerBengt Thuree47-123/+123
jjb/aai/aai-aai-common.yaml jjb/aai/aai-babel.yaml jjb/aai/aai-graphadmin.yaml jjb/aai/aai-graphgraph.yaml jjb/aai/aai-model-loader.yaml jjb/aai/aai-resources.yaml jjb/aai/aai-schema-service.yaml jjb/aai/aai-sparky-be.yaml jjb/aai/aai-traversal.yaml jjb/ccsdk/apps.yaml jjb/cli/cli.yaml jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml jjb/dcaegen2/dcaegen2-collectors-datafile.yaml jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml jjb/dcaegen2/dcaegen2-collectors-restconf.yaml jjb/integration/docker/integration-docker-onap-python.yaml jjb/integration/integration-data-provider.yaml jjb/integration/integration-docker.yaml jjb/integration/integration-templates-csit.yaml jjb/integration/integration-templates-docker.yaml jjb/integration/integration.yaml jjb/integration/simulators/integration-5G-core-nf-simulator.yaml jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml jjb/integration/simulators/integration-core-nssmf-simulator.yaml jjb/integration/simulators/integration-pnf-simulator.yaml jjb/integration/simulators/integration-ran-simulator.yaml jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml jjb/sdc/sdc-sdc-distribution-client.yaml jjb/sdc/sdc-sdc-docker-base.yaml jjb/sdc/sdc-sdc-helm-validator.yaml jjb/sdc/sdc-sdc-workflow-designer.yaml jjb/sdc/sdc.yaml jjb/sdnc/sdnc-apps.yaml jjb/sdnc/sdnc-oam.yaml jjb/so/so-adapters-so-cnf-adapter.yaml jjb/so/so-adapters-so-etsi-sol003-adapter.yaml jjb/so/so-adapters-so-etsi-sol005-adapter.yaml jjb/so/so-adapters-so-nssmf-adapter.yaml jjb/so/so-adapters-so-oof-adapter.yaml jjb/so/so-so-admin-cockpit.yaml jjb/so/so-so-etsi-nfvo.yaml jjb/so/so.yaml jjb/vvp/vvp-test-engine.yaml jjb/vvp/vvp-validation-scripts.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Change-Id: I11105d9ef07c3748f5b2c9c5f82b328eafd00718
2022-09-29[CPS] Build node for CPS-CSITmpriyank1-0/+1
- Added a specific build node to run the csits using a specific machine. Issue-ID: CPS-1310 Change-Id: I029e59b0699adb496cc2c1b3fc9a499cb3166ef9 Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
2022-09-29Enable SBOM on etsicatalog projectdengyh1-0/+2
Change-Id: I58d0211abb4595f40e0e7984a736060d3cd8d786 Issue-ID: MODELING-641 Signed-off-by: dengyh <dengyuanhong@chinamobile.com>
2022-09-28Merge "Chore: Move to ubuntu2004-docker"Jessica Wagantall15-40/+40
2022-09-28Merge "Chore: Move to ubuntu2004-docker"Jessica Wagantall15-29/+29
2022-09-28Chore: Move to ubuntu2004-dockerBengt Thuree15-40/+40
jjb/aai/aai-aai-common.yaml jjb/aai/aai-babel.yaml jjb/aai/aai-graphadmin.yaml jjb/aai/aai-graphgraph.yaml jjb/aai/aai-model-loader.yaml jjb/aai/aai-resources.yaml jjb/aai/aai-schema-service.yaml jjb/aai/aai-sparky-be.yaml jjb/aai/aai-traversal.yaml jjb/ccsdk/apps.yaml jjb/cli/cli.yaml jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml jjb/dcaegen2/dcaegen2-collectors-datafile.yaml jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml jjb/dcaegen2/dcaegen2-collectors-restconf.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: If1f1bdbf0c61acb634a5a5e6afb1479f32322ca9
2022-09-28Merge "Chore: Move to ubuntu2004-docker"Jessica Wagantall15-50/+50
2022-09-28Merge "Chore: Move to ubuntu2004-docker"Jessica Wagantall2-4/+4
2022-09-28Merge "Chore: Move to ubuntu2004-builder"Jessica Wagantall15-25/+25
2022-09-28Merge "Chore: Move to ubuntu2004-builder"Jessica Wagantall15-22/+22
2022-09-28Merge "Chore: Move to ubuntu2004-builder"Jessica Wagantall15-29/+29
2022-09-28Merge "Chore: Move to ubuntu2004-builder"Jessica Wagantall15-24/+24
2022-09-28Merge "Chore: Move to ubuntu2004-builder"Jessica Wagantall15-27/+27
2022-09-28Merge "Chore: Move to ubuntu2004-builder"Jessica Wagantall15-28/+28
2022-09-28Merge "Chore: Move to ubuntu2004-builder"Jessica Wagantall9-19/+19
2022-09-28Merge "[DCAE] Remove istanbul branch job"Jessica Wagantall24-88/+2
2022-09-28[DCAE] Remove istanbul branch jobVijay Venkatesh Kumar24-88/+2
Istanbul out of maintenance + NexusIQ cannot support multiple branches Change-Id: I321604b961aa1b4078328c25c92d2ef072a547ba Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-3276 Issue-ID: DCAEGEN2-3236 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
2022-09-28Enabled SBOM on HOLMESGuangrong Fu3-0/+3
Issue-ID: HOLMES-574 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn> Change-Id: Ie3891663e9120c670adf4df0c84c054eb0b962a3
2022-09-28Chore: Move to ubuntu2004-dockerBengt Thuree2-4/+4
jjb/vvp/vvp-test-engine.yaml jjb/vvp/vvp-validation-scripts.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Change-Id: I05d007db3322093de6c4b36808e14ab968b43e47
2022-09-28Chore: Move to ubuntu2004-dockerBengt Thuree15-50/+50
jjb/sdc/sdc-sdc-distribution-client.yaml jjb/sdc/sdc-sdc-docker-base.yaml jjb/sdc/sdc-sdc-helm-validator.yaml jjb/sdc/sdc-sdc-workflow-designer.yaml jjb/sdc/sdc.yaml jjb/sdnc/sdnc-apps.yaml jjb/sdnc/sdnc-oam.yaml jjb/so/so-adapters-so-cnf-adapter.yaml jjb/so/so-adapters-so-etsi-sol003-adapter.yaml jjb/so/so-adapters-so-etsi-sol005-adapter.yaml jjb/so/so-adapters-so-nssmf-adapter.yaml jjb/so/so-adapters-so-oof-adapter.yaml jjb/so/so-so-admin-cockpit.yaml jjb/so/so-so-etsi-nfvo.yaml jjb/so/so.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Change-Id: Idc4566f2388c63b6962dc8250fbea5f13a7e6b09
2022-09-28Chore: Move to ubuntu2004-dockerBengt Thuree15-29/+29
jjb/integration/docker/integration-docker-onap-python.yaml jjb/integration/integration-data-provider.yaml jjb/integration/integration-docker.yaml jjb/integration/integration-templates-csit.yaml jjb/integration/integration-templates-docker.yaml jjb/integration/integration.yaml jjb/integration/simulators/integration-5G-core-nf-simulator.yaml jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml jjb/integration/simulators/integration-core-nssmf-simulator.yaml jjb/integration/simulators/integration-pnf-simulator.yaml jjb/integration/simulators/integration-ran-simulator.yaml jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Change-Id: I5f0ea439b8a1b7e161c1651cdbf6e133f5e6e9ea
2022-09-28Chore: Move to ubuntu2004-builderBengt Thuree9-19/+19
jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml jjb/vfc/vfc-nfvo-lcm-java.yaml jjb/vfc/vfc-nfvo-lcm-python.yaml jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml jjb/vnfsdk/vnfsdk-functest.yaml jjb/vnfsdk/vnfsdk-pkgtools-python.yaml jjb/vnfsdk/vnfsdk-refrepo.yaml jjb/vnfsdk/vnfsdk-validation.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Change-Id: I1d2ff08605ed34f00eadb0fa8877783cf615215f
2022-09-28Chore: Move to ubuntu2004-builderBengt Thuree15-28/+28
jjb/usecaseui/usecase-ui-nlp.yaml jjb/usecaseui/usecase-ui-server.yaml jjb/usecaseui/usecase-ui.yaml jjb/vfc/vfc-gvnfm-vnflcm-java.yaml jjb/vfc/vfc-gvnfm-vnflcm-python.yaml jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml jjb/vfc/vfc-gvnfm-vnfres-java.yaml jjb/vfc/vfc-gvnfm-vnfres-python.yaml jjb/vfc/vfc-nfvo-db.yaml jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org> Change-Id: I0e52e1d9c8148718a9e9f2ca7256301ca9517c9d