scottk/wlan-testing
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-testing.git synced 2025-10-30 18:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

test-orchestrator: Do partial uploads of just the new files instead of full upload.

Browse Source 
Full upload each time does not scale well, so improve logic to just upload
the new reports that were found, and newly generated kpi graphs and data.
This commit is contained in:
Ben Greear
2020-05-22 15:36:57 -07:00
parent 3ec6ecb309
commit 6ed760d244
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
cicd/jfrog.pl
View File

@@ -20,7 +20,9 @@ my $kpi_dir = "/home/greearb/git/tip/wlan-lanforge-scripts/gui/";
my @ttypes = ("fast", "basic");
my $duplicate_work = 1;
my $ul_dest = "www:candela_html/examples/cicd/"; # used by scp
my $ul_host = "www";
my $ul_dir = "candela_html/examples/cicd/"; # used by scp
my $ul_dest = "$ul_host:$ul_dir"; # used by scp
my $other_ul_dest = ""; # used by scp
my $usage = qq($0
@@ -74,21 +76,44 @@ for ($j = 0; $j<@ttypes; $j++) {
my $ln = $lines[$i];
chomp($ln);
if ($ln =~ /(.*)\/NEW_RESULTS/) {
my $process = $1;
my $completed = `cat $ln`;
my $process = $1; # For example: ben-home/reports/fast
my $completed = `cat $ln`; # Contents of the results file
chomp($completed);
if ($ln =~ /(.*)\/reports\/$ttype\/NEW_RESULTS/) {
my $tbed = $1;
my $cmd;
`rm ./$tbed/pending_work/$completed`;
print "Processing new results, line: $ln process: $process completed: $completed testbed: $tbed\n";
my $cmd = "cd $kpi_dir && java kpi --dir \"$pwd/$process\" && cd -";
# Figure out the new directory from the work-item.
my $wi = `cat ./$tbed/pending_work/$completed`;
`mv ./$tbed/pending_work/$completed /tmp/`;
if ($wi =~ /CICD_RPT_NAME=(.*)/g) {
my $widir = $1;
# Ensure we have a place to copy the new report
$cmd = "ssh $ul_host \"mkdir -p $ul_dir/$bed/$ttype\"";
print "Ensure directory exists: $cmd";
`$cmd`;
# Upload the report directory
$cmd = "scp -C -r $process/$widir $ul_dest/$tbed/$ttype/";
print "Uploading: $cmd";
`$cmd`;
}
$cmd = "cd $kpi_dir && java kpi --dir \"$pwd/$process\" && cd -";
print ("Running kpi: $cmd\n");
`$cmd`;
`rm $ln`;
$cmd = "scp -C -r $process $ul_dest/$tbed/";
$cmd = "scp -C $process/*.png $process/*.html $process/*.csv $process/*.ico $process/*.css $ul_dest/$tbed/$ttype/";
print "Uploading: $cmd";
`$cmd`;
# This might need similar partial-upload logic as that above, if it is ever actually
# enabled.
if ($other_ul_dest ne "") {
$cmd = "scp -C -r $process $other_ul_dest/$tbed/";
print "Uploading to secondary location: $cmd";