Yaniv Dary has uploaded a new change for review. Change subject: packaging: setup: Do not check jasper home existance ......................................................................
packaging: setup: Do not check jasper home existance as it might not exist - we want to allow: $ yum install ovirt-engine ovirt-engine-reports-setup $ engine-setup and have jasperreports installed by setup. Keep the check for developer mode. Change-Id: I03c17c01c4d8bad7dadfda21ea60eb6d671637df Bug-Url: https://bugzilla.redhat.com/1093360 Signed-off-by: Yedidyah Bar David <[email protected]> (cherry picked from commit cb9f81c828a591293c67eedc930c6b968adfbb96) --- M packaging/setup/ovirt_engine_setup/reportsconstants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py 4 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/79/27379/1 diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py b/packaging/setup/ovirt_engine_setup/reportsconstants.py index e68176c..097890b 100644 --- a/packaging/setup/ovirt_engine_setup/reportsconstants.py +++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py @@ -182,6 +182,7 @@ DB_SCHEMA = 'osetup.reports.db.schema' JASPER_DEPLOY_EXPORT = 'osetup.reports.jasper.deploy.export' JASPER_DEPLOY_IMPORT = 'osetup.reports.jasper.deploy.import' + JASPER_NAME_SET = 'osetup.reports.jasper.name.set' @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py index 096fa2d..59d44c2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py @@ -45,6 +45,7 @@ condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], after=( osetupcons.Stages.DB_CONNECTION_AVAILABLE, + oreportscons.Stages.JASPER_NAME_SET, ), ) def misc(self): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py index 6e33910..7a43a9f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py @@ -25,6 +25,7 @@ from otopi import plugin +from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup import reportsconstants as oreportscons @@ -45,6 +46,9 @@ @plugin.event( stage=plugin.Stages.STAGE_VALIDATION, + condition=lambda self: self.environment[ + osetupcons.CoreEnv.DEVELOPER_MODE + ], ) def _validation(self): if not os.path.exists( diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py index 056069c..83e1fe0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py @@ -518,6 +518,12 @@ ) ) + @plugin.event( + stage=plugin.Stages.STAGE_MISC, + name=oreportscons.Stages.JASPER_NAME_SET, + condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], + ) + def _jasper_name(self): install = glob.glob( os.path.join( self.environment[oreportscons.ConfigEnv.JASPER_HOME], @@ -548,6 +554,9 @@ ), before=( oreportscons.Stages.DB_SCHEMA, + ), + after=( + oreportscons.Stages.JASPER_NAME_SET, ), ) def _export(self): @@ -675,6 +684,9 @@ stage=plugin.Stages.STAGE_MISC, name=oreportscons.Stages.DB_SCHEMA, condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], + after=( + oreportscons.Stages.JASPER_NAME_SET, + ), ) def _deploy(self): standalone = os.path.join( @@ -723,6 +735,7 @@ condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], after=( oreportscons.Stages.DB_SCHEMA, + oreportscons.Stages.JASPER_NAME_SET, ), ) def _import(self): -- To view, visit http://gerrit.ovirt.org/27379 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03c17c01c4d8bad7dadfda21ea60eb6d671637df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Yaniv Dary <[email protected]> Gerrit-Reviewer: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
