[ARVADOS] updated: 1.1.3-269-g1472874

[Git user]

Summary of changes:
 services/{fuse => nodemanager}/arvados_version.py              | 0
 services/nodemanager/setup.py                                  | 7 ++++---
 {services/fuse => tools/crunchstat-summary}/arvados_version.py | 0
 tools/crunchstat-summary/setup.py                              | 7 ++++---
 4 files changed, 8 insertions(+), 6 deletions(-)
 copy services/{fuse => nodemanager}/arvados_version.py (100%)
 copy {services/fuse => tools/crunchstat-summary}/arvados_version.py (100%)

       via  1472874c523505dae5bd37580137fbbd14418734 (commit)
      from  8c23153687c226e1db2e61965d109dc99163f170 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1472874c523505dae5bd37580137fbbd14418734
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Mar 26 11:54:12 2018 -0300

    13200: Fix format gitinfo on all the services
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/services/nodemanager/arvados_version.py b/services/nodemanager/arvados_version.py
new file mode 100644
index 0000000..db46417
--- /dev/null
+++ b/services/nodemanager/arvados_version.py
@@ -0,0 +1,20 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import subprocess
+import time
+
+class VersionInfoFromGit():
+    """Return arvados version from git
+    """
+    def git_latest_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'describe', '--abbrev=0']).strip()
+        return str(gitinfo.decode('utf-8'))
+
+    def git_timestamp_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'log', '--first-parent', '--max-count=1',
+             '--format=format:%ct', '.']).strip()
+        return str(time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo))))
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 454c24e..9ae1135 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -15,13 +15,14 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
     try:
-        import gittaggers
-        tagger = gittaggers.EggInfoFromGit
+        import arvados_version
+        vtag = arvados_version.VersionInfoFromGit()
+        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
     except ImportError:
         pass
 
+
 setup(name='arvados-node-manager',
       version=version,
       description='Arvados compute node manager',
diff --git a/tools/crunchstat-summary/arvados_version.py b/tools/crunchstat-summary/arvados_version.py
new file mode 100644
index 0000000..db46417
--- /dev/null
+++ b/tools/crunchstat-summary/arvados_version.py
@@ -0,0 +1,20 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import subprocess
+import time
+
+class VersionInfoFromGit():
+    """Return arvados version from git
+    """
+    def git_latest_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'describe', '--abbrev=0']).strip()
+        return str(gitinfo.decode('utf-8'))
+
+    def git_timestamp_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'log', '--first-parent', '--max-count=1',
+             '--format=format:%ct', '.']).strip()
+        return str(time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo))))
diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py
index ce1467b..0965fae 100755
--- a/tools/crunchstat-summary/setup.py
+++ b/tools/crunchstat-summary/setup.py
@@ -14,13 +14,14 @@ SETUP_DIR = os.path.dirname(__file__) or '.'
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
     try:
-        import gittaggers
-        tagger = gittaggers.EggInfoFromGit
+        import arvados_version
+        vtag = arvados_version.VersionInfoFromGit()
+        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
     except ImportError:
         pass
 
+
 setup(name='crunchstat_summary',
       version=version,
       description='read crunch log files and summarize resource usage',

-----------------------------------------------------------------------


hooks/post-receive
--