Changeset 34520 for other-projects/nightly-tasks/diffcol/trunk
- Timestamp:
- 2020-10-29T13:56:14+13:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/task.pl
r34418 r34520 1078 1078 #use the correct key for uploading 1079 1079 $ENV{'IDENTITY_FILE'} = "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} . ($^O eq "MSWin32" ? ".ppk" : ""); 1080 1080 1081 if(-f $ENV{'IDENTITY_FILE'}) { 1081 1082 # if you need to touch the file on windows: http://stackoverflow.com/questions/51435/windows-version-of-the-unix-touch-command … … 1091 1092 } 1092 1093 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 1094 1104 $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.htm* | "; #&& cat *.html | "; # && tar -c * | 1095 1105 $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"; 1097 1107 #print "$command\n"; 1098 1108 $status = system("$command"); … … 1101 1111 } 1102 1112 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 } 1107 1116 print STDERR "Finished uploading\n"; 1108 1117 } … … 1113 1122 sub mail_with_report_attached 1114 1123 { 1115 # email out with report attached, if the tests failed 1124 # email out with report attached, if the tests failed wwwdev 1116 1125 print STDERR "Checking if successful... \n"; 1117 1126 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.