From 41a79db76ab767e22333121194c45306c9c7c6a3 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 27 Feb 2020 13:56:49 -0500 Subject: [PATCH] Nodemanager and crunchstat-summary sync with pysdk version refs #16151 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- services/nodemanager/arvados_version.py | 17 ++++++++++++++++- tools/crunchstat-summary/arvados_version.py | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/services/nodemanager/arvados_version.py b/services/nodemanager/arvados_version.py index 9aabff4292..0c653694f5 100644 --- a/services/nodemanager/arvados_version.py +++ b/services/nodemanager/arvados_version.py @@ -7,8 +7,23 @@ import time import os import re +SETUP_DIR = os.path.dirname(os.path.abspath(__file__)) + +def choose_version_from(): + sdk_ts = subprocess.check_output( + ['git', 'log', '--first-parent', '--max-count=1', + '--format=format:%ct', os.path.join(SETUP_DIR, "../../sdk/python")]).strip() + cwl_ts = subprocess.check_output( + ['git', 'log', '--first-parent', '--max-count=1', + '--format=format:%ct', SETUP_DIR]).strip() + if int(sdk_ts) > int(cwl_ts): + getver = os.path.join(SETUP_DIR, "../../sdk/python") + else: + getver = SETUP_DIR + return getver + def git_version_at_commit(): - curdir = os.path.dirname(os.path.abspath(__file__)) + curdir = choose_version_from() myhash = subprocess.check_output(['git', 'log', '-n1', '--first-parent', '--format=%H', curdir]).strip() myversion = subprocess.check_output([curdir+'/../../build/version-at-commit.sh', myhash]).strip().decode() diff --git a/tools/crunchstat-summary/arvados_version.py b/tools/crunchstat-summary/arvados_version.py index 9aabff4292..0c653694f5 100644 --- a/tools/crunchstat-summary/arvados_version.py +++ b/tools/crunchstat-summary/arvados_version.py @@ -7,8 +7,23 @@ import time import os import re +SETUP_DIR = os.path.dirname(os.path.abspath(__file__)) + +def choose_version_from(): + sdk_ts = subprocess.check_output( + ['git', 'log', '--first-parent', '--max-count=1', + '--format=format:%ct', os.path.join(SETUP_DIR, "../../sdk/python")]).strip() + cwl_ts = subprocess.check_output( + ['git', 'log', '--first-parent', '--max-count=1', + '--format=format:%ct', SETUP_DIR]).strip() + if int(sdk_ts) > int(cwl_ts): + getver = os.path.join(SETUP_DIR, "../../sdk/python") + else: + getver = SETUP_DIR + return getver + def git_version_at_commit(): - curdir = os.path.dirname(os.path.abspath(__file__)) + curdir = choose_version_from() myhash = subprocess.check_output(['git', 'log', '-n1', '--first-parent', '--format=%H', curdir]).strip() myversion = subprocess.check_output([curdir+'/../../build/version-at-commit.sh', myhash]).strip().decode() -- 2.30.2