Remove support from groups from spma yumng backend

Author: jrha

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

@@ -4,7 +4,7 @@
 
 unique template components/spma/yumng/config;
 
-# Prefix for packages/groups
+# Prefix for packages
 prefix '/software';
 
 # Package to install
@@ -16,7 +16,6 @@ prefix '/software/components/${project.artifactId}';
 'packager' = 'yumng';
 
 'register_change' ?= list(
-    "/software/groups",
     "/software/packages",
     "/software/repositories",
 );

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

@@ -7,16 +7,6 @@ declaration template components/spma/yumng/schema;
 include 'components/spma/schema';
 include 'components/spma/schema-common-yum';
 
-type SOFTWARE_GROUP = {
-    "default" : boolean = true
-    "mandatory" : boolean = true
-    "optional" : boolean = false
-    "names" : string[] = list() with {
-        if (length(SELF) > 0) deprecated(0, 'Support for YUM groups will be removed in a future release.');
-        true;
-    }
-};
-
 type component_spma_yumng = {
     include structure_component
     include component_spma_common
@@ -29,4 +19,3 @@ type component_spma_yumng = {
 };
 
 bind "/software/components/spma" = component_spma_yumng;
-bind "/software/groups" = SOFTWARE_GROUP;

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

@@ -26,7 +26,6 @@ use constant DOMAINNAME          => "/system/network/domainname";
 use constant REPOS_DIR           => "/etc/yum.repos.d";
 use constant REPOS_TREE          => "/software/repositories";
 use constant PKGS_TREE           => "/software/packages";
-use constant GROUPS_TREE         => "/software/groups/names";
 use constant CMP_TREE            => "/software/components/spma";
 use constant YUM_PACKAGE_LIST    => "/etc/yum/pluginconf.d/versionlock.list";
 use constant YUM_CONF_FILE       => "/etc/yum.conf";
@@ -180,12 +179,12 @@ sub Configure
 
     my $repos = $config->getElement(REPOS_TREE)->getTree();
     my $t     = $config->getElement(CMP_TREE)->getTree();
-    
+
     # Display system info
     if ( defined($t->{quattor_os_release}) ) {
         $self->info("target OS build: ", $t->{quattor_os_release});
     }
-    
+
     # Detect OS
     my $fhi;
     my $os_major;
@@ -387,15 +386,6 @@ sub Configure
         }
     }
 
-    # RHEL7 needs converting groups
-    if ( $os_major eq '7' ) {
-        ( $cmd_exit, $cmd_out, $cmd_err ) = $self->execute_command( [ "yum groups mark convert " . YUM_PLUGIN_OPTS ], "converting groups", 1 );
-        if ( $cmd_exit ) {
-            $self->error("Failed to do group conversion on RHEL7.");
-            return 0;
-        }
-    }
-
     # Get list of packages installed on system before any package modifications.
     my $preinstalled = $self->get_installed_rpms();
     return 1 if !defined($preinstalled);
@@ -421,13 +411,6 @@ sub Configure
         }
     }
 
-    # Test whether comps/groups are sane.
-    ( $cmd_exit, $cmd_out, $cmd_err ) = $self->execute_command( [ "yum groupinfo core " . YUM_PLUGIN_OPTS ], "testing comps/groups sanity", 1 );
-    if ( $cmd_exit ) {
-        $self->error("Groups are not sane - core group missing. Will not continue.");
-        return 0;
-    }
-
     # Query metadata for version locked packages including Epoch and write versionlock.list
     ( $cmd_exit, $cmd_out, $cmd_err ) = $self->execute_command( [REPO_AVAIL_PKGS], "fetching full package list", 1, "/dev/null", 1 );
     if ( $cmd_exit ) {
@@ -498,12 +481,10 @@ sub Configure
     return 1 unless $t->{run};
 
     # Run test transaction to get complete list of packages to be present on the system
-    my $groups           = $config->getElement(GROUPS_TREE)->getTree();
     $self->execute_command( [ "rm -rf " . YUM_TEST_CHROOT ], "cleaning YUM test chroot", 1 );
     $self->execute_command( [ "mkdir -p " . YUM_TEST_CHROOT . "/var/cache" ],                 "setting up YUM test chroot",    1 );
     $self->execute_command( [ "ln -s /var/cache/yum " . YUM_TEST_CHROOT . "/var/cache/yum" ], "setting YUM test chroot cache", 1 );
     my $yum_install_test_command = "yum install " . YUM_PLUGIN_OPTS . " -C --installroot=" . YUM_TEST_CHROOT;
-    if (@$groups)             { $yum_install_test_command .= " @" . join   ( " @",   sort @$groups ); }
     if (@$wanted_pkgs_locked) { $yum_install_test_command .= " " . join    ( " ",    sort @$wanted_pkgs_locked ); }
     if (@$wanted_pkgs)        { $yum_install_test_command .= " " . join    ( " ",    sort @$wanted_pkgs ); }
     ( $cmd_exit, $cmd_out, $cmd_err ) = $self->execute_command( [$yum_install_test_command], "performing YUM chroot install test", 1, "/dev/null", "verbose", 1 );
@@ -835,4 +816,3 @@ sub Configure
 }
 
 1;    # required for Perl modules
-