Skip to content

Commit f82c84e

Browse files
committed
Remove support from groups from spma yumng backend
1 parent 7a12116 commit f82c84e

File tree

3 files changed

+1
-25
lines changed

3 files changed

+1
-25
lines changed

ncm-spma/src/main/pan/components/spma/yumng/config.pan

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
unique template components/spma/yumng/config;
66

7-
# Prefix for packages/groups
7+
# Prefix for packages
88
prefix '/software';
99

1010
# Package to install
@@ -16,7 +16,6 @@ prefix '/software/components/${project.artifactId}';
1616
'packager' = 'yumng';
1717

1818
'register_change' ?= list(
19-
"/software/groups",
2019
"/software/packages",
2120
"/software/repositories",
2221
);

ncm-spma/src/main/pan/components/spma/yumng/schema.pan

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ declaration template components/spma/yumng/schema;
77
include 'components/spma/schema';
88
include 'components/spma/schema-common-yum';
99

10-
type SOFTWARE_GROUP = {
11-
"default" : boolean = true
12-
"mandatory" : boolean = true
13-
"optional" : boolean = false
14-
"names" : string[] = list() with {
15-
if (length(SELF) > 0) deprecated(0, 'Support for YUM groups will be removed in a future release.');
16-
true;
17-
}
18-
};
19-
2010
type component_spma_yumng = {
2111
include structure_component
2212
include component_spma_common
@@ -31,4 +21,3 @@ type component_spma_yumng = {
3121
};
3222

3323
bind "/software/components/spma" = component_spma_yumng;
34-
bind "/software/groups" = SOFTWARE_GROUP;

ncm-spma/src/main/perl/spma/yumng.pm

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use Text::Glob qw(match_glob);
2424
use constant REPOS_DIR => "/etc/yum.repos.d";
2525
use constant REPOS_TREE => "/software/repositories";
2626
use constant PKGS_TREE => "/software/packages";
27-
use constant GROUPS_TREE => "/software/groups/names";
2827
use constant CMP_TREE => "/software/components/spma";
2928
use constant YUM_PACKAGE_LIST => "/etc/yum/pluginconf.d/versionlock.list";
3029
use constant YUM_CONF_FILE => "/etc/yum.conf";
@@ -325,16 +324,6 @@ sub Configure
325324
}
326325
}
327326

328-
my $groups = defined($config->getElement(GROUPS_TREE)) ? $config->getElement(GROUPS_TREE)->getTree() : [];
329-
# RHEL7 needs converting groups
330-
if ($os_major eq '7' && @$groups) {
331-
($cmd_exit, $cmd_out, $cmd_err) = $self->execute_command(["yum groups mark convert " . YUM_PLUGIN_OPTS], "converting groups", 1);
332-
if ($cmd_exit) {
333-
$self->error("Failed to do group conversion on RHEL7.");
334-
return 0;
335-
}
336-
}
337-
338327
# Get list of packages installed on system before any package modifications.
339328
my $preinstalled = $self->get_installed_rpms();
340329
return 1 if !defined($preinstalled);
@@ -448,7 +437,6 @@ sub Configure
448437
$self->execute_command(["mkdir -p " . $yum_test_chroot . "/var/cache"], "setting up YUM test chroot", 1);
449438
$self->execute_command(["ln -s /var/cache/yum " . $yum_test_chroot . "/var/cache/yum"], "setting YUM test chroot cache", 1);
450439
my $yum_install_test_command = "yum install " . YUM_PLUGIN_OPTS . " -C --installroot=" . $yum_test_chroot;
451-
if (@$groups) { $yum_install_test_command .= " @" . join (" @", sort @$groups); }
452440
if (@$wanted_pkgs_locked) { $yum_install_test_command .= " " . join (" ", sort @$wanted_pkgs_locked); }
453441
if (@$wanted_pkgs) { $yum_install_test_command .= " " . join (" ", sort @$wanted_pkgs); }
454442
($cmd_exit, $cmd_out, $cmd_err) = $self->execute_command([$yum_install_test_command], "performing YUM chroot install test", 1, "/dev/null", "verbose", 1);

0 commit comments

Comments
 (0)