Changeset 27657 for other-projects/nightly-tasks/diffcol

Timestamp:

2013-06-18T20:37:31+12:00 (11 years ago)

Author:

ak19

Message:

Delete the upload_dir and recreate it before moving the generated reports into here and uploading to puka. The diffcol cronjob will run on the main machine now, not the vm.

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (2 diffs)

other-projects/nightly-tasks/diffcol/trunk/task.pl

@@ -502 +502 @@
 
 sub upload {
-    # ensure the upload directory exists before trying to transfer the xml and html files across
-    # if it already existed, clear it of contents
-    if (! -d $ENV{'UPLOAD_DIR'}) {
-    &File::Path::make_path($ENV{'UPLOAD_DIR'});
-    } # else rm $UPLOAD_DIR/*    
+    # if the upload dir already existed, clear it of contents
+    if (-d $ENV{'UPLOAD_DIR'}) { #else rm $UPLOAD_DIR/* 
+    # don't want to keep previous days reports
+    # else we will have to manually clear them at some point
+    # just generate the set of reports for this run of task.pl upload
+    # and 
+    &File::Path::remove_tree($ENV{'UPLOAD_DIR'});
+    }
+    # recreate the upload directory    
+    &File::Path::make_path($ENV{'UPLOAD_DIR'});
 
     # copy all *.xml and *.html files across to UPLOAD_DIR
@@ -531 +536 @@
     $ENV{'IDENTITY_FILE'} = "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} . ($^O eq "MSWin32" ? ".ppk" : "");
     if(-f $ENV{'IDENTITY_FILE'}) {
-    my $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.html | "; #&& cat *.html | "; # && tar -c * | 
+    # the report we want to upload is actually just report-$dateid.html
+    my $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.html | "; #&& cat *.html | "; # && tar -c * |
     $command .= ($^O eq "MSWin32" ? "plink" : "ssh");
     $command .= " -T -i \"$ENV{'IDENTITY_FILE'}\" nzdl\@puka.cs.waikato.ac.nz";