fix(genesis): validate repository manifests early

lib/XCAT/GenesisRelease.pm

@@ -17,6 +17,7 @@ our @EXPORT_OK = qw(
   validate_architecture
   validate_complete_release
   validate_export
+  validate_repository_packages
   validate_release
   verify_release_file
 );
@@ -65,6 +66,18 @@ sub minimum_release_version {
     die "No release format supports the requested Genesis architectures\n";
 }
 
+sub validate_repository_packages {
+    my ($packages, $section, $prefix, @supported_names) = @_;
+    my %supported = map { $_ => 1 } @supported_names;
+    my @missing = grep { !exists $packages->{$_} } @supported_names;
+    my @unknown = grep {
+        index($_, $prefix) == 0 && !$supported{$_}
+    } sort keys %{$packages};
+    die "FATAL: [$section] is missing supported packages: @missing\n" if @missing;
+    die "FATAL: [$section] has unsupported packages: @unknown\n" if @unknown;
+    return $packages;
+}
+
 sub _read_key_values {
     my ($path, $allowed) = @_;
     my %values;

mockbuild-all.pl

@@ -35,6 +35,7 @@ use XCAT::BuildUtils qw(
 use XCAT::GenesisRelease qw(
   architectures
   rpm_package_name
+  validate_repository_packages
   validated_release_checksums
   verify_release_file
 );
@@ -1120,17 +1121,12 @@ sub common_repository_requirements {
     die "FATAL: no [common] section in $manifest -- cannot verify the shared Genesis repository\n"
         if !%common;
 
-    my @supported_names = map { rpm_package_name($_) } architectures();
-    my %supported = map { $_ => 1 } @supported_names;
-    my @manifest_missing = grep { !exists $common{$_} } @supported_names;
-    my @manifest_unknown = grep {
-        m{\AxCAT-genesis-openembedded-}xms && !$supported{$_}
-    } sort keys %common;
-    die "FATAL: [common] is missing supported packages: @manifest_missing\n"
-      if @manifest_missing;
-    die "FATAL: [common] has unsupported packages: @manifest_unknown\n"
-      if @manifest_unknown;
-    return \%common;
+    return validate_repository_packages(
+        \%common,
+        'common',
+        'xCAT-genesis-openembedded-',
+        map { rpm_package_name($_) } architectures(),
+    );
 }
 
 sub replace_common_repository {

sbuild-all.pl

@@ -312,6 +312,7 @@ if ($genesis_release ne '') {
     # the verifier runs would satisfy both the verifier and any single pass taken afterwards.
     require XCAT::BuildUtils;
     require XCAT::GenesisRelease;
+    shared_repository_requirements();
     my $before = XCAT::GenesisRelease::validated_release_checksums($genesis_release);
     XCAT::BuildUtils::run_command($^X, $verifier, '--complete', '--format', 'deb', $genesis_release);
     my $after = XCAT::GenesisRelease::validated_release_checksums($genesis_release);
@@ -1049,24 +1050,7 @@ sub install_genesis_release_debs {
 
 sub verify_shared_pool {
     my ($pool) = @_;
-    my %shared = %{ $MANIFEST{shared} // {} };
-    die "FATAL: no [shared] section in $manifest -- cannot verify the shared Genesis pool\n"
-        if !%shared;
-
-    my @supported_names = map {
-        XCAT::GenesisRelease::deb_package_name($_)
-    } XCAT::GenesisRelease::architectures();
-    my %supported = map { $_ => 1 } @supported_names;
-    my @manifest_missing = grep { !exists $shared{$_} } @supported_names;
-    my @manifest_unknown = grep {
-        m{\Axcat-genesis-openembedded-}xms && !$supported{$_}
-    } sort keys %shared;
-    die "FATAL: [shared] is missing supported packages: @manifest_missing\n"
-      if @manifest_missing;
-    die "FATAL: [shared] has unsupported packages: @manifest_unknown\n"
-      if @manifest_unknown;
-
-    my %req = %shared;
+    my %req = %{ shared_repository_requirements() };
     my @names = sort keys %req;
     my %present = map { $_ => deb_version($pool, $_) } @names;
     my @problems = verify_repo_packages(\%req, \%present);
@@ -1078,6 +1062,19 @@ sub verify_shared_pool {
     return 1;
 }
 
+sub shared_repository_requirements {
+    my %shared = %{ $MANIFEST{shared} // {} };
+    die "FATAL: no [shared] section in $manifest -- cannot verify the shared Genesis pool\n"
+        if !%shared;
+    return XCAT::GenesisRelease::validate_repository_packages(
+        \%shared,
+        'shared',
+        'xcat-genesis-openembedded-',
+        map { XCAT::GenesisRelease::deb_package_name($_) }
+          XCAT::GenesisRelease::architectures(),
+    );
+}
+
 sub assemble_into {
     my ($dir, $expect) = @_;
     if ($genesis_release ne '') {