Changeset 34520


Ignore:
Timestamp:
10/29/20 13:56:14 (5 weeks ago)
Author:
Jeremy Symon
Message:

need to use ed25519 key on www-internal

File:
1 edited

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

    r34418 r34520  
    10781078    #use the correct key for uploading
    10791079    $ENV{'IDENTITY_FILE'} = "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} . ($^O eq "MSWin32" ? ".ppk" : "");
     1080
    10801081    if(-f $ENV{'IDENTITY_FILE'}) {
    10811082    # if you need to touch the file on windows: http://stackoverflow.com/questions/51435/windows-version-of-the-unix-touch-command
     
    10911092    }
    10921093
    1093         # for now, upload a copy to the new machine, later to replace puka
     1094   
     1095    } else {
     1096    print STDERR "*** Cannot upload the test report to nzdl from this machine - no identity file $ENV{'IDENTITY_FILE'}\n";
     1097    }
     1098
     1099    #use the  correct key for uploading - ed25519 for www-internal
     1100    $ENV{'IDENTITY_FILE_ED25519'} = "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} ."-ed25519". ($^O eq "MSWin32" ? ".ppk" : "");
     1101
     1102    if (-f $ENV{'IDENTITY_FILE_ED25519'}) {
     1103        # for now, upload a copy to the new new machine, later to replace puka
    10941104        $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.htm* | "; #&& cat *.html | "; # && tar -c * |
    10951105        $command .= ($^O eq "MSWin32" ? "plink" : "ssh");
    1096         $command .= " -T -i \"$ENV{'IDENTITY_FILE'}\" nzdl-gsorg\@www-internal.greenstone.org";
     1106        $command .= " -T -i \"$ENV{'IDENTITY_FILE_ED25519'}\" nzdl-gsorg\@www-internal.greenstone.org";
    10971107        #print "$command\n";
    10981108        $status = system("$command");
     
    11011111        }
    11021112   
    1103     } else {
    1104     print STDERR "*** Cannot upload the test report to nzdl from this machine\n";
    1105     }
    1106 
     1113    } else {
     1114        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";
     1115    }
    11071116    print STDERR "Finished uploading\n";
    11081117}
     
    11131122sub mail_with_report_attached
    11141123{
    1115     # email out with report attached, if the tests failed                                                     
     1124    # email out with report attached, if the tests failed                            wwwdev                         
    11161125    print STDERR "Checking if successful... \n";
    11171126    my $cmd = "java org.apache.xalan.xslt.Process -IN $xmlout -XSL $ENV{'TASK_HOME'}/xsl/passed-or-not.xsl";
Note: See TracChangeset for help on using the changeset viewer.