Changeset 27637 for other-projects/nightly-tasks/diffcol/trunk/task.pl

Timestamp:

2013-06-17T22:05:58+12:00 (11 years ago)

Author:

ak19

Message:

Added section which does uploading to nzdl (though that will only work on the VM installations with the correct .ssh files), bugfix to checking upload_dir exists and added some error handling for sending attachments by mail

File:

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

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

@@ -504 +504 @@
     # 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'}) {
+    if (!-d $ENV{'UPLOAD_DIR'}) {
     &File::Path::make_path($ENV{'UPLOAD_DIR'});
     } # else rm $UPLOAD_DIR/*    
@@ -515 +515 @@
     }
     closedir $dh;
+
+
+    # Upload the html file to puka
+    #default identity dir
+    if ( ! exists $ENV{'IDENTITY_DIR'} ) {
+    $ENV{'IDENTITY_DIR'} = "$ENV{'HOME'}${sep}.ssh";
+    }
+    if (! exists $ENV{'SNAPSHOT_MODE'} ) {
+    $ENV{'SNAPSHOT_MODE'} = "caveat";
+    }
+
+    #use the  correct key for uploading
+    $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 * | 
+    $command .= ($^O eq "MSWin32" ? "plink" : "ssh");
+    $command .= " -T -i \"$ENV{'IDENTITY_FILE'}\" nzdl\@puka.cs.waikato.ac.nz";
+    #print "$command\n";
+    my $status = system("$command");
+    if($status != 0) {
+        print STDERR "*** Failed to upload test report to nzdl\n";
+    }
+    } else {
+    print STDERR "*** Cannot upload the test report to nzdl from this machine\n";
+    }
 
     print STDERR "Finished uploading\n";
@@ -560 +585 @@
 
     # run the mail command
-    system($cmd); # &run_and_print_cmd($cmd);
-
-    print STDERR "Sent mail with report attached.\n";
+    $result = system($cmd); #&run_and_print_cmd($cmd);
+    if($result != 0) {
+        print STDERR "*** Unable to send email: $?\n";
+    }
+    else {
+        print STDERR "Sent mail with report attached.\n";
+    }
     } else {
     print STDERR "********************************************\n";