WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/checkRelease.pl

 my $opt_rtag_id;
 my $opt_test = 0;
 my $opt_patch = 1;
 my $opt_rootpkg;
 my $opt_rootpkg_version;
+my $opt_extract;
+#
 #   Data Base Interface
+#
 my $RM_DB;
 my $sbom_branch;
 my $sbom_project;
 my $sbom_version;
 my $rtag_release;
 my $rtag_project;
+my %config;
+#
 #   Packages to be ignored
+#
 my %ignore;
                 "rtagid|rtag_id=s"  => \$opt_rtag_id,           # string
                 "rootpackage=s"     => \$opt_rootpkg,           # String
                 "ignore=s",         => sub{my ($a,$i) = @_; $ignore{$i} = 0 },
                 "test!"             => \$opt_test,              #[no]flag
                 "patch!"            => \$opt_patch,             #[no]flag
+                "extract=s"         => \$opt_extract,           # Name of file
                 );
+#
 #   Process help and manual options
+#
 pod2usage(-verbose => 0, -message => "Version: $VERSION")  if ($opt_help == 1  || ! $result);
 pod2usage(-verbose => 1)  if ($opt_help == 2 );
 pod2usage(-verbose => 2)  if ($opt_help > 2);
-ErrorConfig( 'name'    => 'ESCROW',
+ErrorConfig( 'name'    => 'CHECK',
              'verbose' => $opt_verbose );
+#
 #   Sanity test
+#
-unless ( $opt_rtag_id || $opt_sbom_id || $#ARGV >= 1)
+unless ( $opt_rtag_id || $opt_sbom_id || $opt_extract || $#ARGV >= 1)
+{
     Error ("Need sbomid and/or rtagid",
            "Example: -sbomid=13543, for NZS Phase-1",
            "Example: -sbomid=13543 -rtagid=xxxx, for NZS Phase-1, compared against given release",
            "Example: -rtagid=2362, for Sydney R1/R2",
            "Example: -rtagid=8843 -root=StockholmSBOM",
            "Example: PackageName PackageVersion, for extracting a single package",
+    )
+}
-Warning ("No sbomid provided. Output based an a Release") unless ( $opt_sbom_id );
-$fpref = "release" unless ( $opt_sbom_id );
+#
 #   Import essential EnvVars
+#
 EnvImport('GBE_DPKG');
+#
+#   The extract option is special
+#   It places the progam in a different mode
+#
+if ( $opt_extract )
+{
+    Error ("Cannot mix -extract with sbomid or rtagid" )
+        if ( $opt_rtag_id || $opt_sbom_id || $#ARGV >= 0 );
+    Error ("Cannot use -nopatch or -ignore with -extract")
+        if ( ! $opt_patch || keys %ignore );
+    Error ("S3 Recovery process must be run as buildadm")
+        unless ($ENV{USER} eq 'buildadm');
+    extract_files();
+    exit (0);
+}
+Warning ("No sbomid provided. Output based an a Release") unless ( $opt_sbom_id );
+$fpref = "release" unless ( $opt_sbom_id );
 if ( $opt_sbom_id )
+{
+    #
     #   Determines the OS_ID's for the bom
+    #
+#
 #   Generate output files
 #       1) Jats extract commands
 #       2) Error list
 my $file;
-$file = "${fpref}_extract.txt";
+$file = "${fpref}_missing.txt";
 push @create_list, $file;
 open (JE, ">$file" ) || Error ("Cannot create $file");
-$file = "${fpref}_status.txt";
+#$file = "${fpref}_status.txt";
-push @create_list, $file;
+#push @create_list, $file;
+#
-open (ST, ">$file" ) || Error("Cannot create $file");
+#open (ST, ">$file" ) || Error("Cannot create $file");
-print ST "Cannot build:\n";
+#print ST "Cannot build:\n";
 my $missing_count = 0;
 my $pkg_count = 0;
 foreach my $name ( sort keys %Package )
+{
        if (! -d $pdir )
+       {
            Warning("Not in dpkg_archive: $name $ver");
            $missing_count++;
+           print JE $name . '/' . $ver . "\n";
            next;
+       }
        if (! $tfile)
+       {
            Warning("Not in dpkg_archive: $name $ver - Bad Form");
            $missing_count++;
+           print JE $name . '/' . $ver . "\n";
            next;
+       }
+    }
+}
 Message("Packages: $pkg_count");
 Message("Missing: $missing_count");
 close (JE);
-close (ST);
+#close (ST);
+#
 #   Display names of files created
+#
 #print "Stray: $pv_id, $name, $ver\n";
+    }
+}
 #-------------------------------------------------------------------------------
+# Function        : extract_files
+#
+# Description     : Alternate mode of operation
+#                   Extract files from the generated list. This is intended to
+#                   be run as a seperate phase taking the 'extract' file
+#
+# Inputs          :
+#
+# Returns         :
+#
+sub extract_files
+{
+    my @extract_order;
+    my %extract;
+    ErrorConfig( 'name'    => 'CHECK-EXTRACT' );
+    #
+    #   Open the file and read in data in one hit
+    #   Each line is <PkgName>/<PkgVersion>
+    #
+    Error ("Cannot find specified file: $opt_extract")
+        unless ( -f $opt_extract );
+    #
+    #   Sanity test
+    #
+    my $tfile = 'sbin/getPkgFromS3.sh';
+    Error("Cannot find expected utility: $tfile") unless (-f $tfile);
+    $tfile = 'sbin/jats_quarantine.cnf';
+    Error("Cannot find expected config file: $tfile") unless (-f $tfile);
+    ReadConfig($tfile);
+    open (FH, "<$opt_extract" ) || Error ("Cannot open file");
+    while ( <FH> )
+    {
+        s~[\r\n]+$~~;
+        Verbose2 ($_);
+        next unless ( $_ );
+        push @extract_order, $_;
+    }
+    close FH;
+    #
+    #   Log the file processing
+    #
+    my $lfile = "${opt_extract}.log";
+    Message ("Creating logfile: ${opt_extract}.log");
+    open (FH, ">$lfile" ) || Error ("Cannot open log file: $lfile");
+    #
+    #   Process each entry
+    #
+    foreach my $pv ( @extract_order )
+    {
+        if ( $opt_test )
+        {
+            Verbose ("$pv");
+            print FH "$pv : TEST\n";
+        }
+        else
+        {
+            my $rv = System ('sbin/getPkgFromS3.sh', "--bucket=$config{S3Bucket}", '-p', $::GBE_DPKG . '/' . $pv);
+            print FH "$pv : SUCCESS\n" unless $rv;
+            print FH "$pv : ERROR\n" if $rv;
+        }
+    }
+    close FH;
+    Message ("Results in logfile: ${opt_extract}.log");
+}
+#-------------------------------------------------------------------------------
+# Function        : ReadConfig
+#
+# Description     : Read in quarantine config file
+#                   Only used during extraction processing
+#
+# Inputs          : $cfile   - Config file to read
+#
+# Returns         :
+#
+sub ReadConfig
+{
+    my ($cfile) = @_;
+    open (CF, '<', $cfile ) || Error ("Connot open: $cfile");
+    while ( <CF> )
+    {
+        s~\s+$~~;
+        s~^\s+~~;
+        next if ( m~\s*#~ );        # Comment
+        next unless $_;             # Empty
+        if ( m~(.*?)\s*=\s*(.*)~ ) {
+            $config{$1} = $2;
+        }
+    }
+    close CF;
+    #
+    # Check that I've got what I need
+    #
+    foreach ( qw(S3Bucket S3Key S3Secret))
+    {
+        ReportError("Config Item not found: $_") unless defined $config{$_};
+    }
+    ErrorDoExit();
+    #
+    #   Export the Secrets in EnvVars
+    #   Use program defaults so that we don't need to specify them
+    #   on the command line - for all to see
+    #
+    $ENV{AWSKEY} = $config{S3Key};
+    $ENV{AWSSECRET} = $config{S3Secret};
+}
+#-------------------------------------------------------------------------------
 #   Documentation
+#
 =pod
     -man               - Full documentation
     -sbomid=xxx        - Specify the SBOM to process
     -rtagid=xxx        - Specify the Release to process (Optional)
     -rootpackage=xxx   - Specifies a root package. In conjunction with -rtagid.
     -ignore=name       - Ignore packages with the specified name
+    -extract=fname     - Extract files from a previous run
     -verbose           - Enable verbose output
     -[no]patch         - Ignore/Include patches. Default:Include
     -[no]test          - Reduced package scanning for test
 =head1 OPTIONS
 =item B<-ignore=name>
 All versions of the named package will be ignored. This parameter is options.
 It may be used multiple times.
+=item B<-extract=name>
+This option will process the 'extract' file created in a previous run of this
+program and restore missing package-versions as specified in the file.
+The command will then create a log file recording packages that could ne be
+extracted.
+This option does not not interwork with many of the other command line options.
+This option cannot be used in conjunction with the -rtagid, -sbomid, rootpackage
+and -nopatch.
 =item B<-[no]patch>
 This option is used ignore patches. If -nopatch is selected, then packages
 versions that look like a patch will be added to the ignore list.

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/checkRelease.pl – Rev 5708 → 5806