[Engine-patches] Change in ovirt-reports[master]: packaging: setup: Pass correct masterPropsSource

[didi]

Yedidyah Bar David has uploaded a new change for review.

Change subject: packaging: setup: Pass correct masterPropsSource
......................................................................

packaging: setup: Pass correct masterPropsSource

Change-Id: I06a16b3861b5c5eae4699edc46af1f814613345b
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/reports/reportsutil.py
M 
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
2 files changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/71/39971/1

diff --git a/packaging/setup/ovirt_engine_setup/reports/reportsutil.py 
b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py
index febcc81..7a367b2 100644
--- a/packaging/setup/ovirt_engine_setup/reports/reportsutil.py
+++ b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py
@@ -142,7 +142,7 @@
         )
         return dest
 
-    def jsimport(self, src):
+    def jsimport(self, src, masterprops):
         self._execute(
             args=(
                 './js-import.sh',
@@ -165,10 +165,7 @@
                     OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG
                 ),
                 'ANT_OPTS': '-DmasterPropsSource={master}'.format(
-                    master=(
-                        oreportscons.FileLocations.
-                        OVIRT_ENGINE_REPORTS_BUILDOMATIC_DBPROP
-                    ),
+                    master=masterprops,
                 ),
             },
         )
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 b06c484..8eb807c 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
@@ -745,6 +745,8 @@
 
         self.logger.info(_('Importing data into Jasper'))
 
+        config = self._jasperConfiguration()
+
         if self._quartzprops:
             with open(
                 oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_JASPER_QUARTZ,
@@ -768,12 +770,12 @@
             )
 
         if self._users:
-            self._oreportsutil.jsimport(self._users)
+            self._oreportsutil.jsimport(self._users, config)
 
         if self._savedReports:
-            self._oreportsutil.jsimport(self._savedReports)
+            self._oreportsutil.jsimport(self._savedReports, config)
 
-        self._oreportsutil.jsimport(self._prepareOvirtReports())
+        self._oreportsutil.jsimport(self._prepareOvirtReports(), config)
 
         #
         # We import users twice because we need permissions to be
@@ -781,10 +783,10 @@
         # reports in previous step.
         #
         if self._users:
-            self._oreportsutil.jsimport(self._users)
+            self._oreportsutil.jsimport(self._users, config)
 
         if self._jobs:
-            self._oreportsutil.jsimport(self._jobs)
+            self._oreportsutil.jsimport(self._jobs, config)
 
         self.logger.info(_('Configuring Jasper Java resources'))
 
@@ -1022,7 +1024,7 @@
                         # addition.freeDoc()
                         pass
 
-        self._oreportsutil.jsimport(everything)
+        self._oreportsutil.jsimport(everything, config)
 
     @plugin.event(
         stage=plugin.Stages.STAGE_MISC,


-- 
To view, visit https://gerrit.ovirt.org/39971
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06a16b3861b5c5eae4699edc46af1f814613345b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches