Moti Asayag has uploaded a new change for review. Change subject: engine: Fix DB build issues ......................................................................
engine: Fix DB build issues The patch modifies the db function update script to use it by its proper signature. In addition the fixture.xml should contain the libvir_version once this new column was introduced. Change-Id: I4f7e26c93eac852c0b71b66c1f24b580ddf48892 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/dbscripts/config_devel.sql M backend/manager/modules/dal/src/test/resources/fixtures.xml 2 files changed, 11 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/9995/1 diff --git a/backend/manager/dbscripts/config_devel.sql b/backend/manager/dbscripts/config_devel.sql index 79807d5..55d201e 100644 --- a/backend/manager/dbscripts/config_devel.sql +++ b/backend/manager/dbscripts/config_devel.sql @@ -5,13 +5,13 @@ select fn_db_update_config_value('ENGINEEARLib','%JBOSS_HOME%/server/engine-slimmed/deploy/engine.ear','general'); select fn_db_update_config_value('InstallVds', 'false','general'); select fn_db_update_config_value('SSLEnabled', 'false','general'); -select fn_db_update_config_value('SysPrep2K3Path','backend/manager/conf/sysprep/sysprep.2k3'); -select fn_db_update_config_value('SysPrep2K8Path','backend/manager/conf/sysprep/sysprep.2k8'); -select fn_db_update_config_value('SysPrep2K8R2Path','backend/manager/conf/sysprep/sysprep.2k8'); -select fn_db_update_config_value('SysPrep2K8x64Path','backend/manager/conf/sysprep/sysprep.2k8x86'); -select fn_db_update_config_value('SysPrepWindows7Path','backend/manager/conf/sysprep/sysprep.w7'); -select fn_db_update_config_value('SysPrepWindows7x64Path','backend/manager/conf/sysprep/sysprep.w7x64'); -select fn_db_update_config_value('SysPrepXPPath','backend/manager/conf/sysprep/sysprep.xp'); +select fn_db_update_config_value('SysPrep2K3Path','backend/manager/conf/sysprep/sysprep.2k3','general'); +select fn_db_update_config_value('SysPrep2K8Path','backend/manager/conf/sysprep/sysprep.2k8','general'); +select fn_db_update_config_value('SysPrep2K8R2Path','backend/manager/conf/sysprep/sysprep.2k8','general'); +select fn_db_update_config_value('SysPrep2K8x64Path','backend/manager/conf/sysprep/sysprep.2k8x86','general'); +select fn_db_update_config_value('SysPrepWindows7Path','backend/manager/conf/sysprep/sysprep.w7','general'); +select fn_db_update_config_value('SysPrepWindows7x64Path','backend/manager/conf/sysprep/sysprep.w7x64','general'); +select fn_db_update_config_value('SysPrepXPPath','backend/manager/conf/sysprep/sysprep.xp','general'); select fn_db_update_config_value('UseSecureConnectionWithServers', 'false','general'); select fn_db_update_config_value('keystorePass','NoSoup4U','general'); select fn_db_update_config_value('keystoreUrl','keys/engine.p12','general'); diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index b476b91..e75c6e7 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -1302,6 +1302,7 @@ <value>RHEL - 6Server - 6.0.0.37.el6</value> <null /> <null /> + <value>2.3</value> <value>2.6.32 - 71.el6</value> <value>iqn.1994-05.com.redhat:3d9116b4c11f</value> <value>0</value> @@ -1341,6 +1342,7 @@ <value>RHEL - 6Server - 6.0.0.37.el6</value> <null /> <null /> + <value>2.3</value> <value>2.6.32 - 71.el6</value> <value>iqn.1994-05.com.redhat:3d9116b4c11f</value> <value>0</value> @@ -1380,6 +1382,7 @@ <value>RHEL - 6Server - 6.0.0.37.el6</value> <null /> <null /> + <value>2.3</value> <value>2.6.32 - 71.el6</value> <value>iqn.1994-05.com.redhat:3d9116b4c11f</value> <value>0</value> @@ -1419,6 +1422,7 @@ <value>RHEL - 6Server - 6.0.0.37.el6</value> <null /> <null /> + <value>2.3</value> <value>2.6.32 - 71.el6</value> <value>iqn.1994-05.com.redhat:3d9116b4c11f</value> <value>0</value> -- To view, visit http://gerrit.ovirt.org/9995 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f7e26c93eac852c0b71b66c1f24b580ddf48892 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
