Changeset 34520

Timestamp:

2020-10-29T13:56:14+13:00 (3 years ago)

Author:

Jeremy Symon

Message:

need to use ed25519 key on www-internal

File:

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

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

@@ -1078 +1078 @@
     #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'}) {
     # if you need to touch the file on windows: http://stackoverflow.com/questions/51435/windows-version-of-the-unix-touch-command
@@ -1091 +1092 @@
     }
 
-        # for now, upload a copy to the new machine, later to replace puka
+    
+    } else {
+    print STDERR "*** Cannot upload the test report to nzdl from this machine - no identity file $ENV{'IDENTITY_FILE'}\n";
+    }
+
+    #use the  correct key for uploading - ed25519 for www-internal
+    $ENV{'IDENTITY_FILE_ED25519'} = "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} ."-ed25519". ($^O eq "MSWin32" ? ".ppk" : "");
+
+    if (-f $ENV{'IDENTITY_FILE_ED25519'}) {
+        # for now, upload a copy to the new new machine, later to replace puka
         $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.htm* | "; #&& cat *.html | "; # && tar -c * |
         $command .= ($^O eq "MSWin32" ? "plink" : "ssh");
-        $command .= " -T -i \"$ENV{'IDENTITY_FILE'}\" nzdl-gsorg\@www-internal.greenstone.org";
+        $command .= " -T -i \"$ENV{'IDENTITY_FILE_ED25519'}\" nzdl-gsorg\@www-internal.greenstone.org";
         #print "$command\n";
         $status = system("$command");
@@ -1101 +1111 @@
         }
     
-    } else {
-    print STDERR "*** Cannot upload the test report to nzdl from this machine\n";
-    }
-
+    } else {
+        print STDERR "**** Cannot upload the test report to www-internal from this machine - you need to generate the ed215519 identity file $ENV{'IDENTITY_FILE_ED25519'}\n";
+    }
     print STDERR "Finished uploading\n";
 }
@@ -1113 +1122 @@
 sub mail_with_report_attached 
 {
-    # email out with report attached, if the tests failed                                                      
+    # email out with report attached, if the tests failed                            wwwdev                          
     print STDERR "Checking if successful... \n";
     my $cmd = "java org.apache.xalan.xslt.Process -IN $xmlout -XSL $ENV{'TASK_HOME'}/xsl/passed-or-not.xsl";