Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Take package names from environment ......................................................................
packaging: setup: Take package names from environment Change-Id: Ibad05b1e0283b0b27fb278a0ba15b3f7e95d747c Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py 3 files changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/25739/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 9803211..b3af66d 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -1050,6 +1050,8 @@ VERSION_LOCK_FILTER = 'OSETUP_RPMDISTRO/versionLockFilter' VERSION_LOCK_APPLY = 'OSETUP_RPMDISTRO/versionLockApply' + ENGINE_PACKAGES = 'OVESETUP_RPMDISTRO/enginePackages' + ENGINE_SETUP_PACKAGES = 'OVESETUP_RPMDISTRO/engineSetupPackages' PACKAGES_UPGRADE_LIST = 'OVESETUP_RPMDISTRO/packagesUpgradeList' PACKAGES_SETUP = 'OVESETUP_RPMDISTRO/packagesSetup' diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py index dae3432..e1aa4dd 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py @@ -280,6 +280,14 @@ osetupcons.RPMDistroEnv.VERSION_LOCK_FILTER, [] ) + self.environment.setdefault( + osetupcons.RPMDistroEnv.ENGINE_PACKAGES, + osetupcons.Const.ENGINE_PACKAGE_NAME + ) + self.environment.setdefault( + osetupcons.RPMDistroEnv.ENGINE_SETUP_PACKAGES, + osetupcons.Const.ENGINE_PACKAGE_SETUP_NAME + ) self.environment[ osetupcons.RPMDistroEnv.PACKAGES_UPGRADE_LIST ] = [] diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py index 5240ca0..01f5ed8 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py @@ -44,6 +44,9 @@ stage=plugin.Stages.STAGE_SETUP, ) def _setup(self): + def tolist(s): + return [e.strip() for e in s.split(',')] + self.environment[ osetupcons.RPMDistroEnv.VERSION_LOCK_FILTER ].append(osetupcons.Const.ENGINE_PACKAGE_NAME) @@ -55,13 +58,17 @@ ].append( { 'group': osetupcons.Const.UPGRADE_YUM_GROUP, - 'packages': (osetupcons.Const.ENGINE_PACKAGE_NAME,), + 'packages': tolist( + self.environment[osetupcons.RPMDistroEnv.ENGINE_PACKAGES] + ), }, ) self.environment[ osetupcons.RPMDistroEnv.PACKAGES_SETUP - ].append( - osetupcons.Const.ENGINE_PACKAGE_SETUP_NAME, + ].extend( + tolist( + self.environment[osetupcons.RPMDistroEnv.ENGINE_SETUP_PACKAGES] + ) ) -- To view, visit http://gerrit.ovirt.org/25739 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibad05b1e0283b0b27fb278a0ba15b3f7e95d747c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
