Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: take yum group name from env ......................................................................
packaging: setup: take yum group name from env Change-Id: I95073ed917a5276b8e3a21fc2f2f1574139f04ca Bug-Url: https://bugzilla.redhat.com/1076046 Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/25817/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index b3af66d..dd8c23d 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -602,7 +602,7 @@ ENGINE_PACKAGE_NAME = 'ovirt-engine' ENGINE_PACKAGE_SETUP_NAME = '%s-setup' % ENGINE_PACKAGE_NAME - UPGRADE_YUM_GROUP = 'ovirt-engine-3.4' + UPGRADE_YUM_GROUP_NAME = 'ovirt-engine-3.4' @classproperty def RPM_LOCK_LIST(self): @@ -1054,6 +1054,7 @@ ENGINE_SETUP_PACKAGES = 'OVESETUP_RPMDISTRO/engineSetupPackages' PACKAGES_UPGRADE_LIST = 'OVESETUP_RPMDISTRO/packagesUpgradeList' PACKAGES_SETUP = 'OVESETUP_RPMDISTRO/packagesSetup' + UPGRADE_YUM_GROUP = 'OVESETUP_RPMDISTRO/upgradeYumGroup' @util.export 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 01f5ed8..1ffa976 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 @@ -41,6 +41,15 @@ super(Plugin, self).__init__(context=context) @plugin.event( + stage=plugin.Stages.STAGE_INIT, + ) + def _init(self): + self.environment.setdefault( + osetupcons.RPMDistroEnv.UPGRADE_YUM_GROUP, + osetupcons.Const.UPGRADE_YUM_GROUP_NAME + ) + + @plugin.event( stage=plugin.Stages.STAGE_SETUP, ) def _setup(self): @@ -57,7 +66,9 @@ osetupcons.RPMDistroEnv.PACKAGES_UPGRADE_LIST ].append( { - 'group': osetupcons.Const.UPGRADE_YUM_GROUP, + 'group': self.environment[ + osetupcons.RPMDistroEnv.UPGRADE_YUM_GROUP + ], 'packages': tolist( self.environment[osetupcons.RPMDistroEnv.ENGINE_PACKAGES] ), -- To view, visit http://gerrit.ovirt.org/25817 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95073ed917a5276b8e3a21fc2f2f1574139f04ca Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
