Changeset 1392 in ProjectBuilder

Timestamp:

Jan 24, 2012, 4:00:44 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds a cleanssh target to purge test versiosn on the remote repository

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb/bin/pb (modified) (8 diffs)

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -308 +308 @@
 #
 
-if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^checkssh/)) {
+if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^checkssh/) || ($action =~ /^cleanssh/)) {
 
     #

devel/pb/bin/pb

@@ -381 +381 @@
 
 Purge the build and delivery directories related to the current project
+
+=back 
+
+=item B<cleanssh>
+
+Purge the ssh server of its packages (only for testver and test packages)
 
 =back 
@@ -707 +713 @@
 
     pb_announce("Announce");
+} elsif ($action =~ /^cleanssh$/) {
+    pb_announce("Clean");
 } elsif ($action =~ /^checkssh$/) {
     pb_announce("Check");
@@ -3229 +3237 @@
     # Get all required parameters
     my ($pbpackager,$pbrepo,$pbml,$pbsmtp) = pb_conf_get("pbpackager","pbrepo","pbml","pbsmtp");
-    my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
+    my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
+    if (((not defined $testver) || (not defined $testver->{$ENV{'PBPROJ'}}) || ($testver->{$ENV{'PBPROJ'}} !~ /true/i)) && ($antype eq "Clean")) {
+        # We just clean for test versions
+        pb_log(0,"Unable to clean SSH repository for non testver version\n");
+        return;
+    }
     my $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
     my @pkgs = @$pkg;
@@ -3248 +3261 @@
     # Command to find packages on repo
     my $findstr = "find ".join(" ",keys %dl)." ";
+    my $srcstr = "";
     # Generated announce files
     my @files;
@@ -3271 +3285 @@
         my $pbrealpkgrpm = pb_cms_get_real_pkg($pbpkg,"rpm");
         my $pbrealpkgdeb = pb_cms_get_real_pkg($pbpkg,"deb");
-        $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver*\.deb\' -o -name \'$pbrealpkg-$pbver*\.ebuild\' -o -name \'$pbrealpkg-$pbver*\.pkg\' -o -name \'$pbrealpkg-$pbver*\.sd\' ";
+        if ($antype eq "Clean") {
+            $pbtag = "0.[0-9][0-9]*";
+            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgrpm-debug-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.dsc\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.tar.gz\' -o -name \'$pbrealpkg-$pbver"."_p[0-9]*\.ebuild\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.pkg\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.sd\' ";
+        } else {
+            $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver*\.deb\' -o -name \'$pbrealpkg-$pbver*\.ebuild\' -o -name \'$pbrealpkg-$pbver*\.pkg\' -o -name \'$pbrealpkg-$pbver*\.sd\' ";
+            $srcstr .= "src/$pbrealpkg-$pbver.tar.gz src/$pbrealpkg-$pbver.pbconf.tar.gz";
+        }
 
         if ($antype eq "Announce") {
@@ -3297 +3317 @@
             close(OUT);
             push(@files,"$ENV{'PBTMP'}/$pbpkg.ann");
-        } else {
+        } elsif ($antype eq "Check") {
             # For the check we also build the theoritical complete list we should get
             foreach my $d (split(/,/,$distrolist)) {
@@ -3318 +3338 @@
         pb_log(2,"theorlist : ".Dumper(%theorlist)."\n");
     }
-    $findstr .= " | grep -Ev \'src.rpm\'" if ($antype eq "Announce");
+    if ($antype eq "Announce") {
+        $findstr .= " | grep -Ev \'src.rpm\'";
+    } elsif ($antype eq "Clean") {
+        $findstr .= " | xargs rm -f -v $srcstr ";
+    }
 
     # Prepare the command to run and execute it
     open(PBS,"> $ENV{'PBTMP'}/pbscript") || die "Unable to create $ENV{'PBTMP'}/pbscript";
+    print PBS "#!/bin/bash\n";
     print PBS "set -x\n" if ($pbdebug gt 1);
     print PBS "$findstr | sort 2> /dev/null\n";
@@ -3327 +3352 @@
     chmod 0755,"$ENV{'PBTMP'}/pbscript";
     pb_send2target("Announce");
+
+    # Nothing more for th cleanssh case
+    return if ($antype eq "Clean");
 
     my $sl = "Project $ENV{'PBPROJ'} version $ENV{'PBPROJVER'} is now available";