13200:test new job with timestamp only removing hash

Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index df86deeb36c3cec52ec1c72acbe24ac502badb5f..a9e62023f4f49736a7abf75993280c7cb26ec81c 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -46,19 +46,12 @@ version_from_git() {
     # dev/prerelease, output a version number based on the git log for
     # the current working directory.
     if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
-        echo "$ARVADOS_BUILDING_VERSION"
-        return
-    fi
-
-    local git_ts git_hash prefix
-    if [[ -n "$1" ]] ; then
-        prefix="$1"
-    else
-        prefix="0.1"
+      local git_ts git_hash prefix
+      declare $(format_last_commit_here "git_ts=%ct")
+      echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+      return
     fi
 
-    declare $(format_last_commit_here "git_ts=%ct")
-    echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
 }
 
 nohash_version_from_git() {