Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: support package customization
......................................................................
packaging: setup: support package customization
Change-Id: Iee60cede8158effd6846d8f0f559dc06d6fc787b
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/reportsconstants.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
2 files changed, 71 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/00/24600/1
diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py
b/packaging/setup/ovirt_engine_setup/reportsconstants.py
index e23072a..677a531 100644
--- a/packaging/setup/ovirt_engine_setup/reportsconstants.py
+++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py
@@ -186,6 +186,8 @@
DB_CONNECTION_CUSTOMIZATION = 'osetup.reports.db.connection.customization'
DB_CONNECTION_AVAILABLE = 'osetup.reports.db.connection.available'
DB_SCHEMA = 'osetup.reports.db.schema'
+ JASPER_DEPLOY_EXPORT = 'osetup.reports.jasper.deploy.export'
+ JASPER_DEPLOY_IMPORT = 'osetup.reports.jasper.deploy.import'
@util.export
@@ -220,6 +222,15 @@
@util.export
@util.codegen
@osetupattrsclass
+class JasperEnv(object):
+ REPORTS_EXPORT = 'OVESETUP_REPORTS_JASPER/reportsExport'
+ SAVED_REPORTS_URI = 'OVESETUP_REPORTS_JASPER/savedReportsUri'
+ THEME = 'OVESETUP_REPORTS_JASPER/theme'
+
+
+@util.export
+@util.codegen
+@osetupattrsclass
class DBEnv(object):
@osetupattrs(
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 608ae11..eaf3a0b 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
@@ -202,6 +202,22 @@
shutil.rmtree(entry['dst'])
def _buildJs(self, cmd, config):
+
+ install = glob.glob(
+ os.path.join(
+ self.environment[oreportscons.ConfigEnv.JASPER_HOME],
+ 'buildomatic',
+ 'js-install-*.sh',
+ )
+ )
+ if len(install) != 1:
+ raise RuntimeError(
+ _('Unexpected jasper installation, js-install-*.sh is missing')
+ )
+ suffix = os.path.basename(install[0]).replace(
+ 'js-install-', ''
+ ).replace('.sh', '')
+
try:
myumask = os.umask(0o022)
@@ -209,7 +225,7 @@
args=(
'./js-ant',
'-DmasterPropsSource=%s' % config,
- cmd
+ '%s-%s' % (cmd, suffix),
),
envAppend={
'JAVA_HOME': self.environment[
@@ -355,7 +371,7 @@
reportsImport = os.path.join(self._temproot, 'ovirt-reports')
shutil.copytree(
- oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_EXPORT,
+ self.environment[oreportscons.JasperEnv.REPORTS_EXPORT],
reportsImport,
symlinks=True,
)
@@ -519,6 +535,19 @@
self._javatmp = os.path.join(self._temproot, 'tmp')
os.mkdir(self._javatmp)
+ self.environment.setdefault(
+ oreportscons.JasperEnv.REPORTS_EXPORT,
+ oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_EXPORT
+ )
+ self.environment.setdefault(
+ oreportscons.JasperEnv.SAVED_REPORTS_URI,
+ '/saved_reports'
+ )
+ self.environment.setdefault(
+ oreportscons.JasperEnv.THEME,
+ 'ovirt-reports-theme'
+ )
+
@plugin.event(
stage=plugin.Stages.STAGE_SETUP,
)
@@ -571,6 +600,7 @@
@plugin.event(
stage=plugin.Stages.STAGE_MISC,
+ name=oreportscons.Stages.JASPER_DEPLOY_EXPORT,
condition=lambda self: (
self.environment[oreportscons.CoreEnv.ENABLE] and
not self.environment[oreportscons.DBEnv.NEW_DATABASE]
@@ -627,13 +657,20 @@
if os.path.exists(
os.path.join(
everything,
- 'resources/saved_reports',
+ os.path.join(
+ 'resources',
+ self.environment[
+ oreportscons.JasperEnv.SAVED_REPORTS_URI
+ ],
+ )
)
):
self._savedReports = self._exportJs(
what='savedReports',
args=(
- '--uris', '/saved_reports',
+ '--uris', self.environment[
+ oreportscons.JasperEnv.SAVED_REPORTS_URI
+ ],
),
)
self._jobs = self._exportJs(
@@ -692,9 +729,9 @@
self.logger.info(_('Deploying Jasper'))
for cmd in (
- 'init-js-db-ce',
- 'import-minimal-ce',
- 'deploy-webapp-ce',
+ 'init-js-db',
+ 'import-minimal',
+ 'deploy-webapp',
):
self._buildJs(config=config, cmd=cmd)
@@ -710,6 +747,7 @@
@plugin.event(
stage=plugin.Stages.STAGE_MISC,
+ name=oreportscons.Stages.JASPER_DEPLOY_IMPORT,
condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE],
after=(
oreportscons.Stages.DB_SCHEMA,
@@ -846,17 +884,19 @@
for f in (
'users/anonymousUser.xml',
'users/jasperadmin.xml',
+ 'users/organization_1/jasperadmin.xml',
):
- with self.XMLDoc(
- os.path.join(
- everything,
- f,
- ),
- ) as xml:
- xml.setNodesContent(
- '/user/enabled',
- 'false',
- )
+ if os.path.exists(f):
+ with self.XMLDoc(
+ os.path.join(
+ everything,
+ f,
+ ),
+ ) as xml:
+ xml.setNodesContent(
+ '/user/enabled',
+ 'false',
+ )
with self.XMLDoc(
os.path.join(
@@ -867,7 +907,9 @@
) as xml:
xml.setNodesContent(
'/organization/theme',
- 'ovirt-reports-theme',
+ self.environment[
+ oreportscons.JasperEnv.THEME
+ ],
)
self._importJs(everything)
--
To view, visit http://gerrit.ovirt.org/24600
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee60cede8158effd6846d8f0f559dc06d6fc787b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
