From f53fdddd56ea15642475dd345cc4bf9aa627cba4 Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Fri, 26 Jun 2020 14:23:49 -0700 Subject: [PATCH] cicd: Fix jfrog regex regression And add some newlines. --- cicd/jfrog.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cicd/jfrog.pl b/cicd/jfrog.pl index 13c299db5..8a3c1e2fd 100755 --- a/cicd/jfrog.pl +++ b/cicd/jfrog.pl @@ -101,21 +101,21 @@ for ($j = 0; $j<@ttypes; $j++) { `mv ./$tbed/pending_work/$completed /tmp/`; - if ($wi =~ /CICD_CASE_ID=(\S+)/g) { + if ($wi =~ /CICD_CASE_ID=(\S+)/) { $caseid = "--caseid $1"; } - if ($wi =~ /CICD_RPT_NAME=(.*)/g) { + if ($wi =~ /CICD_RPT_NAME=(.*)/) { my $widir = $1; # Ensure we have a place to copy the new report $cmd = "ssh $ul_host \"mkdir -p $ul_dir/$tbed/$ttype\""; - print "Ensure directory exists: $cmd"; + print "Ensure directory exists: $cmd\n"; `$cmd`; # Upload the report directory $cmd = "scp -C -r $process/$widir $ul_dest/$tbed/$ttype/"; - print "Uploading: $cmd"; + print "Uploading: $cmd\n"; `$cmd`; $caseid .= " --results_url $result_url_base/$tbed/$ttype/$widir";