From 5cd465ce3e0c69c39f1ac10c1a167e182e69a01d Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Fri, 3 Jul 2020 16:14:21 -0700 Subject: [PATCH] cicd: Fix bad regex in testbed_poll If debugging is enabled, the 'echo' command would show the same thing we were searching for, but with a single trailing quote. Check for that and remove the trailing quote if needed. Signed-off-by: Ben Greear --- cicd/testbed_poll.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cicd/testbed_poll.pl b/cicd/testbed_poll.pl index 71ed79d61..fe599423c 100755 --- a/cicd/testbed_poll.pl +++ b/cicd/testbed_poll.pl @@ -408,8 +408,11 @@ $cloud_sdk opensync.zone1.art2wave.com print_note("Upload results."); #When complete, upload the results to the requested location. - if ($ap_out =~ /Results-Dir: (.*)/g) { + if ($ap_out =~ /Results-Dir: (.*)/) { my $rslts_dir = $1; + if ($rslts_dir =~ /(.*)\'/) { + $rslts_dir = $1; + } print ("Found results at: $rslts_dir\n"); do_system("rm -fr /tmp/$report_name"); do_system("mv $rslts_dir /tmp/$report_name");