[yetus] branch main updated: YETUS-998. Post vote table changes glitches (#136)

[aw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git


The following commit(s) were added to refs/heads/main by this push:
     new 12d5968  YETUS-998. Post vote table changes glitches (#136)
12d5968 is described below

commit 12d596803b309dcd430e56e21061cef80ce3d41c
Author: Allen Wittenauer <aw...@apache.org>
AuthorDate: Wed Sep 30 07:57:40 2020 -0700

    YETUS-998. Post vote table changes glitches (#136)
---
 precommit/src/main/shell/test-patch.d/jira.sh       | 15 ++++++++++-----
 precommit/src/main/shell/test-patch.d/test4tests.sh |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/precommit/src/main/shell/test-patch.d/jira.sh b/precommit/src/main/shell/test-patch.d/jira.sh
index acbd0b7..7b293eb 100755
--- a/precommit/src/main/shell/test-patch.d/jira.sh
+++ b/precommit/src/main/shell/test-patch.d/jira.sh
@@ -419,6 +419,8 @@ function jira_finalreport
   declare calctime
   declare url
   declare logfile
+  declare fn
+  declare logurl
 
   url=$(get_artifact_url)
 
@@ -501,16 +503,19 @@ function jira_finalreport
       esac
     fi
     if [[ -n "${logfile}" ]]; then
-      logfile=$(echo "${logfile}" |
-              "${SED}" -e "s,@@BASE@@,${url},g")
+      fn=${logfile//@@BASE@@/}
+      if [[ "${url}" =~ http ]]; then
+        logurl=${logfile//@@BASE@@/${url}}
+        fn="[${fn}|${logurl}]"
+      fi
     else
-      logfile=""
+      fn=""
     fi
-    printf '| {color:%s}%s{color} | {color:%s}%s{color} | {color:%s}%s{color} | {color:%s}%s{color} | {color:%s}%s{color} |\n' \
+    printf '| {color:%s}%s{color} | {color:%s}%s{color} | {color:%s}%s{color} | %s | {color:%s}%s{color} |\n' \
       "${color}" "${vote}" \
       "${color}" "${subs}" \
       "${color}" "${calctime}" \
-      "${color}" "${logfile}" \
+      "${fn}" \
       "${color}" "${comment}" \
       >> "${commentfile}"
     ((i=i+1))
diff --git a/precommit/src/main/shell/test-patch.d/test4tests.sh b/precommit/src/main/shell/test-patch.d/test4tests.sh
index fe1eb33..06b860c 100755
--- a/precommit/src/main/shell/test-patch.d/test4tests.sh
+++ b/precommit/src/main/shell/test-patch.d/test4tests.sh
@@ -54,7 +54,7 @@ function test4tests_patchfile
       "Also please list what manual steps were performed to verify this patch."
     return 1
   fi
-  add_vote_table_v2 +1 "" "test4tests" \
+  add_vote_table_v2 +1 "test4tests" "" \
     "The patch appears to include ${testReferences} new or modified test files."
   return 0
 }